8347376: tools/jlink/runtimeImage/JavaSEReproducibleTest.java and PackagedModulesVsRuntimeImageLinkTest.java failed after JDK-8321413

slowhog · slowhog · commit dfd215b7e9e4 · 2025-01-14T15:26:36.000Z
Reviewed-by: dholmes, iklam, alanb
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ModuleDescriptorBuilder.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ModuleDescriptorBuilder.java
@@ -277,7 +277,7 @@ private Snippet buildProvidesArray(ClassBuilder clb) {
                     .classBuilder(clb)
                     .ownerClassDesc(ownerClassDesc)
                     .enablePagination("module" + index + "Provides")
-                    .build(builder.buildAll(md.provides()));
+                    .build(builder.buildAll(sorted(md.provides())));
         }
 
         private Snippet buildPackagesSet(ClassBuilder clb, Collection<String> packages) {
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
@@ -716,9 +716,6 @@ javax/swing/plaf/synth/7158712/bug7158712.java 8324782 macosx-all
 
 # core_tools
 
-tools/jlink/runtimeImage/JavaSEReproducibleTest.java 8347376 generic-all
-tools/jlink/runtimeImage/PackagedModulesVsRuntimeImageLinkTest.java 8347376 generic-all
-
 ############################################################################
 
 # core_svc

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ private Snippet buildProvidesArray(ClassBuilder clb) {`
`277`	`277`	`.classBuilder(clb)`
`278`	`278`	`.ownerClassDesc(ownerClassDesc)`
`279`	`279`	`.enablePagination("module" + index + "Provides")`
`280`		`- .build(builder.buildAll(md.provides()));`
	`280`	`+ .build(builder.buildAll(sorted(md.provides())));`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`private Snippet buildPackagesSet(ClassBuilder clb, Collection<String> packages) {`