Getting rid of all XML

oracle · Jul 12, 2020 · 95b2fec · 95b2fec
1 parent 151698d
commit 95b2fec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...evm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKInitializationFeature.java b/...evm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKInitializationFeature.java
@@ -141,6 +141,7 @@ public void afterRegistration(AfterRegistrationAccess access) {
         rci.initializeAtBuildTime("sun.security.internal.interfaces", "Core JDK classes are initialized at build time");
         rci.initializeAtBuildTime("sun.security.internal.spec", "Core JDK classes are initialized at build time");
         rci.initializeAtBuildTime("sun.security.jca", "Core JDK classes are initialized at build time");
+        rci.initializeAtBuildTime("org.jcp.xml.dsig.internal.dom.XMLDSigRI", "Required for sun.security.jca");
         rci.initializeAtBuildTime("sun.security.jgss", "Core JDK classes are initialized at build time");
         rci.initializeAtBuildTime("sun.security.krb5", "Core JDK classes are initialized at build time");
         rci.initializeAtBuildTime("sun.security.pkcs", "Core JDK classes are initialized at build time");
@@ -164,10 +165,6 @@ public void afterRegistration(AfterRegistrationAccess access) {
         rci.initializeAtBuildTime("org.ietf.jgss", "Core JDK classes are initialized at build time for better performance");
         rci.initializeAtBuildTime("com.sun.security.jgss", "Core JDK classes are initialized at build time for better performance");
 
-        rci.initializeAtBuildTime("org.jcp.xml", "Core JDK classes are initialized at build time for better performance");
-        rci.initializeAtBuildTime("javax.xml.crypto", "Core JDK classes are initialized at build time for better performance");
-        rci.initializeAtBuildTime("com.sun.org.apache.xml.internal.security", "Core JDK classes are initialized at build time for better performance");
-
         /* Needed by our substitutions */
         rci.initializeAtBuildTime("jdk.jfr", "Core JDK classes are initialized at build time for better performance");
     }

diff --git a/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/JUnitFeature.java b/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/JUnitFeature.java
@@ -68,6 +68,7 @@ public void duringSetup(DuringSetupAccess access) {
         RuntimeClassInitialization.initializeAtBuildTime(org.junit.runner.Description.class);
         RuntimeClassInitialization.initializeAtBuildTime(org.junit.runners.ParentRunner.class);
         RuntimeClassInitialization.initializeAtBuildTime(org.junit.runners.Parameterized.class);
+        RuntimeClassInitialization.initializeAtBuildTime("jcp.xml.dsig.internal.dom.XMLDSigRI");
         RuntimeClassInitialization.initializeAtBuildTime("org.junit.runners.ParentRunner$1");
         RuntimeClassInitialization.initializeAtBuildTime(org.junit.runner.Request.class);
         RuntimeClassInitialization.initializeAtBuildTime("org.junit.runner.Request$1");