From a655eb483c28908291813a29442e775665ad2331 Mon Sep 17 00:00:00 2001 From: jonmv Date: Sun, 17 Dec 2023 14:08:19 +0100 Subject: Use natural artifact order, with own project at end --- .../main/java/com/yahoo/container/plugin/mojo/AssembleFatJarMojo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleFatJarMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleFatJarMojo.java index ca2ffbb178e..54676fcbfc9 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleFatJarMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleFatJarMojo.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.StandardCopyOption; -import java.util.Comparator; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.SortedSet; @@ -104,7 +104,7 @@ public class AssembleFatJarMojo extends AbstractMojo { var jarsToShade = projectDependencies.stream() .filter(d -> !installedDependencies.contains(d) && !d.getType().equals("pom") && d.getScope().equals("compile")) .map(Artifact::getFile) - .collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.reverseOrder()))); + .collect(Collectors.toCollection(LinkedHashSet::new)); jarsToShade.add(project.getArtifact().getFile()); try { var classpath = generateClasspath(installedDependencies, projectDependencies); -- cgit v1.2.3