Skip to content

Commit 1a428f2

Browse files
zakkakfranz1981
authored andcommitted
Exclude new GraalVM dependencies that are part of GraalVM/Mandrel
oracle/graal#7171 splits graal-sdk in 4 new modules/artifacts. As a result starting with GraalVM for JDK 21 (23.1) we need to remove those as well. Note that it's OK to have them marked for removal even when using GraalVM < 23.1 despite them not actually being present. Closes quarkusio#35872
1 parent 86dff36 commit 1a428f2

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1003,11 +1003,15 @@ private NativeImageSourceJarBuildItem buildNativeImageThinJar(CurateOutcomeBuild
10031003

10041004
// Remove svm and graal-sdk artifacts as they are provided by GraalVM itself
10051005
if (classLoadingConfig.removedArtifacts.isEmpty()) {
1006-
classLoadingConfig.removedArtifacts = Optional.of(new ArrayList<>(2));
1006+
classLoadingConfig.removedArtifacts = Optional.of(new ArrayList<>(6));
10071007
}
10081008
List<String> removedArtifacts = classLoadingConfig.removedArtifacts.get();
10091009
removedArtifacts.add("org.graalvm.nativeimage:svm");
10101010
removedArtifacts.add("org.graalvm.sdk:graal-sdk");
1011+
removedArtifacts.add("org.graalvm.sdk:nativeimage");
1012+
removedArtifacts.add("org.graalvm.sdk:word");
1013+
removedArtifacts.add("org.graalvm.sdk:collections");
1014+
removedArtifacts.add("org.graalvm.polyglot:polyglot");
10111015

10121016
doLegacyThinJarGeneration(curateOutcomeBuildItem, outputTargetBuildItem, transformedClasses,
10131017
applicationArchivesBuildItem, applicationInfo, packageConfig, generatedResources, libDir, allClasses,

0 commit comments

Comments
 (0)