diff options
author | jonmv <venstad@gmail.com> | 2023-12-17 12:45:29 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-12-17 12:45:29 +0100 |
commit | 5eb199b2b5670458324c4e6073a5a810bee33364 (patch) | |
tree | caf488f7fe3c1d0c4062248d394547384d8ab21c /bundle-plugin | |
parent | f9c603a4bb98169c29372e93ebaf8203deb24089 (diff) |
Revert "Merge pull request #29683 from vespa-engine/revert-29678-jonmv/reapply-zk-3.9.1"
This reverts commit c8ece8b229362c7bf725e4433ef4fec86024cd29, reversing
changes made to d42b67f0fe821d122548a345f27fda7f9c9c9d10.
Diffstat (limited to 'bundle-plugin')
-rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleFatJarMojo.java | 3 |
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); |