diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-01-12 13:47:58 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-01-12 13:48:10 +0100 |
commit | 09bf8a9cdc1e22dffd2ea55dc7753ee16e6488e4 (patch) | |
tree | 4c9564eb9ea236badb83faf71d99606dfe3054b6 /bundle-plugin/src | |
parent | bf97fcd47792f15d15f5b25fc3373fc654a87baf (diff) |
Always include default excludes. Skip type 'pom'.
Diffstat (limited to 'bundle-plugin/src')
-rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleFatJarMojo.java | 16 |
1 files changed, 11 insertions, 5 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 b71912fc7b0..e9a7d93f8f6 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 @@ -68,7 +68,9 @@ public class AssembleFatJarMojo extends AbstractMojo { public String mainClass; @Parameter - public String[] excludes = new String[] { + public String[] excludes = new String[0]; + + private final Set<String> defaultExcludes = Set.of( "META-INF/DEPENDENCIES", "META-INF/LICENSE*", "META-INF/NOTICE*", @@ -80,8 +82,7 @@ public class AssembleFatJarMojo extends AbstractMojo { "module-info.class", "license/*", "**/package-info.class", - "**/module-info.class", - }; + "**/module-info.class"); @Override public void execute() throws MojoExecutionException { @@ -91,7 +92,11 @@ public class AssembleFatJarMojo extends AbstractMojo { var archiveFilter = new ArchiveFilter() { @Override public String getArtifact() { return null; } @Override public Set<String> getIncludes() { return Set.of(); } - @Override public Set<String> getExcludes() { return Set.of(excludes); } + @Override public Set<String> getExcludes() { + var values = new TreeSet<>(defaultExcludes); + values.addAll(List.of(excludes)); + return values; + } @Override public boolean getExcludeDefaults() { return true; } }; var jarsToShade = projectDependencies.stream() @@ -152,7 +157,8 @@ public class AssembleFatJarMojo extends AbstractMojo { SortedSet<Artifact> children = new TreeSet<>(); if (node.getChildren() != null) { for (DependencyNode dep : node.getChildren()) { - children.add(dep.getArtifact()); + var a = dep.getArtifact(); + if (!a.getType().equals("pom")) children.add(a); children.addAll(getAllRecursive(dep)); } } |