From dfd215b7e9e40526006448369c8847aadfe0926b Mon Sep 17 00:00:00 2001
From: Henry Jen <henryjen@openjdk.org>
Date: Tue, 14 Jan 2025 15:26:36 +0000
Subject: [PATCH] 8347376: tools/jlink/runtimeImage/JavaSEReproducibleTest.java
 and PackagedModulesVsRuntimeImageLinkTest.java failed after JDK-8321413

Reviewed-by: dholmes, iklam, alanb
---
 .../tools/jlink/internal/plugins/ModuleDescriptorBuilder.java  | 2 +-
 test/jdk/ProblemList.txt                                       | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

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
index dac50c86161..87f4ddcdbc6 100644
--- 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 @@ class ModuleDescriptorBuilder implements IndexedElementSnippetBuilder<ModuleInfo
                     .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
index b82d661bd2d..1d5eb6d9298 100644
--- 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