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 2213e0683ea5b9c84bb0d6dbc00a7cad8b570559..fa6e5a96eaba4f820d455c6a74da615cdffe88fe 100644 (file)
--- 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");
        }
 
 }