From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 30 Jul 2022 09:14:03 +0000 (+0200)
Subject: Start adapting to GraalVM v22.2.0
X-Git-Tag: v2.3.5~12
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=c04f41a2e0438a8557287aec2bc6228a201bd42b;p=gpl%2Fargeo-slc.git

Start adapting to GraalVM v22.2.0
---

diff --git a/graalvm/org.argeo.slc.graalvm/src/org/argeo/slc/graalvm/feature/ArgeoToolFeature.java b/graalvm/org.argeo.slc.graalvm/src/org/argeo/slc/graalvm/feature/ArgeoToolFeature.java
index 2213e0683..fa6e5a96e 100644
--- a/graalvm/org.argeo.slc.graalvm/src/org/argeo/slc/graalvm/feature/ArgeoToolFeature.java
+++ b/graalvm/org.argeo.slc.graalvm/src/org/argeo/slc/graalvm/feature/ArgeoToolFeature.java
@@ -3,10 +3,8 @@ package org.argeo.slc.graalvm.feature;
 import java.security.Security;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
-import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
 
 import net.i2p.crypto.eddsa.EdDSASecurityProvider;
 
@@ -27,10 +25,10 @@ public class ArgeoToolFeature implements Feature {
 		// required for Tomcat JNI DLL to load properly
 		RuntimeClassInitialization.initializeAtBuildTime("org.apache.tomcat.jni");
 
-		RuntimeClassInitializationSupport rci = ImageSingletons.lookup(RuntimeClassInitializationSupport.class);
-		rci.rerunInitialization("org.bouncycastle.jcajce.provider.drbg.DRBG$Default", "dependency with native random");
-		rci.rerunInitialization("org.bouncycastle.jcajce.provider.drbg.DRBG$NonceAndIV",
-				"dependency with native random");
+//		RuntimeClassInitializationSupport rci = ImageSingletonsSupport.lookup(RuntimeClassInitializationSupport.class);
+//		rci.rerunInitialization("org.bouncycastle.jcajce.provider.drbg.DRBG$Default", "dependency with native random");
+//		rci.rerunInitialization("org.bouncycastle.jcajce.provider.drbg.DRBG$NonceAndIV",
+//				"dependency with native random");
 	}
 
 }