From c04f41a2e0438a8557287aec2bc6228a201bd42b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 30 Jul 2022 11:14:03 +0200 Subject: [PATCH] Start adapting to GraalVM v22.2.0 --- .../argeo/slc/graalvm/feature/ArgeoToolFeature.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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"); } } -- 2.30.2