Fix org.graalvm.nativeimage.builder exports

Modular multi-release JARs can't export version-specific packages.
oracle · Nov 10, 2021 · e02fcc1 · e02fcc1
1 parent 6cae92d
commit e02fcc1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/...1/ClassLoaderSupportImplJDK11OrLater.java → ...k/ClassLoaderSupportImplJDK11OrLater.java b/...1/ClassLoaderSupportImplJDK11OrLater.java → ...k/ClassLoaderSupportImplJDK11OrLater.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.oracle.svm.hosted.jdk11;
+package com.oracle.svm.hosted.jdk;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;

diff --git a/...eImageClassLoaderSupportJDK11OrLater.java → ...eImageClassLoaderSupportJDK11OrLater.java b/...eImageClassLoaderSupportJDK11OrLater.java → ...eImageClassLoaderSupportJDK11OrLater.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.jdk11;
+package com.oracle.svm.hosted.jdk;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...tion/LocalizationFeatureJDK11OrLater.java → ...tion/LocalizationFeatureJDK11OrLater.java b/...tion/LocalizationFeatureJDK11OrLater.java → ...tion/LocalizationFeatureJDK11OrLater.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.oracle.svm.hosted.jdk11.localization;
+package com.oracle.svm.hosted.jdk.localization;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -34,7 +34,6 @@
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 
 import com.oracle.svm.core.annotate.AutomaticFeature;
-import com.oracle.svm.hosted.jdk.localization.LocalizationFeature;
 
 //Checkstyle: stop
 import sun.text.spi.JavaTimeDateTimePatternProvider;

diff --git a/...atevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java b/...atevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
@@ -205,7 +205,7 @@ private static AbstractNativeImageClassLoaderSupport createNativeImageClassLoade
         if (JavaVersionUtil.JAVA_SPEC >= 11) {
             /* Instantiate module-aware NativeImageClassLoaderSupport */
             try {
-                Class<?> nativeImageClassLoaderSupport = Class.forName("com.oracle.svm.hosted.jdk11.NativeImageClassLoaderSupportJDK11OrLater");
+                Class<?> nativeImageClassLoaderSupport = Class.forName("com.oracle.svm.hosted.jdk.NativeImageClassLoaderSupportJDK11OrLater");
                 Constructor<?> nativeImageClassLoaderSupportConstructor = nativeImageClassLoaderSupport.getConstructor(ClassLoader.class, String[].class, String[].class);
                 return (AbstractNativeImageClassLoaderSupport) nativeImageClassLoaderSupportConstructor.newInstance(defaultSystemClassLoader, classpath, modulePath);
             } catch (ReflectiveOperationException e) {