From ae0bb731ce50c883e3e9325ac9b8c7499d2bb73b Mon Sep 17 00:00:00 2001 From: jonmv Date: Fri, 15 Dec 2023 17:05:00 +0100 Subject: Consistent class overwriting order for fat-jar vs multiple deps with class --- .../main/java/com/yahoo/container/plugin/mojo/AssembleFatJarMojo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 920883bfb0a..ca2ffbb178e 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,6 +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.List; import java.util.Set; import java.util.SortedSet; @@ -103,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(TreeSet::new)); + .collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.reverseOrder()))); jarsToShade.add(project.getArtifact().getFile()); try { var classpath = generateClasspath(installedDependencies, projectDependencies); -- cgit v1.2.3