Skip to content

Commit e02fcc1

Browse files
committed
Fix org.graalvm.nativeimage.builder exports
Modular multi-release JARs can't export version-specific packages.
1 parent 6cae92d commit e02fcc1

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* questions.
2424
*/
2525

26-
package com.oracle.svm.hosted.jdk11;
26+
package com.oracle.svm.hosted.jdk;
2727

2828
import java.util.ArrayDeque;
2929
import java.util.ArrayList;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* or visit www.oracle.com if you need additional information or have any
2323
* questions.
2424
*/
25-
package com.oracle.svm.hosted.jdk11;
25+
package com.oracle.svm.hosted.jdk;
2626

2727
import java.io.File;
2828
import java.io.IOException;
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* questions.
2424
*/
2525

26-
package com.oracle.svm.hosted.jdk11.localization;
26+
package com.oracle.svm.hosted.jdk.localization;
2727

2828
import java.util.ArrayList;
2929
import java.util.Collections;
@@ -34,7 +34,6 @@
3434
import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
3535

3636
import com.oracle.svm.core.annotate.AutomaticFeature;
37-
import com.oracle.svm.hosted.jdk.localization.LocalizationFeature;
3837

3938
//Checkstyle: stop
4039
import sun.text.spi.JavaTimeDateTimePatternProvider;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ private static AbstractNativeImageClassLoaderSupport createNativeImageClassLoade
205205
if (JavaVersionUtil.JAVA_SPEC >= 11) {
206206
/* Instantiate module-aware NativeImageClassLoaderSupport */
207207
try {
208-
Class<?> nativeImageClassLoaderSupport = Class.forName("com.oracle.svm.hosted.jdk11.NativeImageClassLoaderSupportJDK11OrLater");
208+
Class<?> nativeImageClassLoaderSupport = Class.forName("com.oracle.svm.hosted.jdk.NativeImageClassLoaderSupportJDK11OrLater");
209209
Constructor<?> nativeImageClassLoaderSupportConstructor = nativeImageClassLoaderSupport.getConstructor(ClassLoader.class, String[].class, String[].class);
210210
return (AbstractNativeImageClassLoaderSupport) nativeImageClassLoaderSupportConstructor.newInstance(defaultSystemClassLoader, classpath, modulePath);
211211
} catch (ReflectiveOperationException e) {

0 commit comments

Comments
 (0)