Skip to content

Commit

Permalink
Exclude new GraalVM dependencies that are part of GraalVM/Mandrel
Browse files Browse the repository at this point in the history
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 #35872
  • Loading branch information
zakkak committed Sep 12, 2023
1 parent c819af6 commit f1476be
Showing 1 changed file with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -1003,11 +1003,15 @@ private NativeImageSourceJarBuildItem buildNativeImageThinJar(CurateOutcomeBuild

// Remove svm and graal-sdk artifacts as they are provided by GraalVM itself
if (classLoadingConfig.removedArtifacts.isEmpty()) {
classLoadingConfig.removedArtifacts = Optional.of(new ArrayList<>(2));
classLoadingConfig.removedArtifacts = Optional.of(new ArrayList<>(5));
}
List<String> removedArtifacts = classLoadingConfig.removedArtifacts.get();
removedArtifacts.add("org.graalvm.nativeimage:svm");
removedArtifacts.add("org.graalvm.sdk:graal-sdk");
removedArtifacts.add("org.graalvm.sdk:nativeimage");
removedArtifacts.add("org.graalvm.sdk:word");
removedArtifacts.add("org.graalvm.sdk:collections");
removedArtifacts.add("org.graalvm.polyglot:polyglot");

doLegacyThinJarGeneration(curateOutcomeBuildItem, outputTargetBuildItem, transformedClasses,
applicationArchivesBuildItem, applicationInfo, packageConfig, generatedResources, libDir, allClasses,
Expand Down

0 comments on commit f1476be

Please sign in to comment.