aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-12-15 17:05:00 +0100
committerjonmv <venstad@gmail.com>2023-12-15 17:05:00 +0100
commitae0bb731ce50c883e3e9325ac9b8c7499d2bb73b (patch)
tree5b565a22cd10be260b9b5af4d57688ecdc7aa473
parent9cf9e62f0d97a0530936c829062320859d3db06c (diff)
Consistent class overwriting order for fat-jar vs multiple deps with class
-rw-r--r--bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleFatJarMojo.java3
1 files changed, 2 insertions, 1 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 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.<File>reverseOrder())));
jarsToShade.add(project.getArtifact().getFile());
try {
var classpath = generateClasspath(installedDependencies, projectDependencies);