aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-02-03 02:05:19 +0100
committergjoranv <gv@verizonmedia.com>2022-02-03 02:36:36 +0100
commitafd0087d92f66e46a4c1ca5e2c0bec166388be25 (patch)
tree8054e809705b88519296a457e500c2864a4cb09d
parent2dced25d329cff2ea5345bf8e5e266f5e1d17ed7 (diff)
Improve maven-shade-plugin filter, and move to parent pom.
- Removes 223 build warnings (out of 562 for building non-test code)
-rw-r--r--application-preprocessor/pom.xml11
-rw-r--r--config-proxy/pom.xml11
-rw-r--r--document/pom.xml11
-rw-r--r--filedistribution/pom.xml11
-rw-r--r--indexinglanguage/pom.xml11
-rw-r--r--logserver/pom.xml11
-rw-r--r--messagebus/pom.xml11
-rw-r--r--parent/pom.xml24
-rw-r--r--security-tools/pom.xml12
-rw-r--r--vespa-hadoop/pom.xml10
-rw-r--r--vespa-http-client/pom.xml11
-rw-r--r--vespa_feed_perf/pom.xml11
-rw-r--r--vespaclient-java/pom.xml11
13 files changed, 24 insertions, 132 deletions
diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml
index a021577f838..45989770da9 100644
--- a/application-preprocessor/pom.xml
+++ b/application-preprocessor/pom.xml
@@ -75,17 +75,6 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<finalName>${project.artifactId}-jar-with-dependencies</finalName>
- <filters>
- <filter>
- <!-- Don't include signature files from bouncycastle in uber jar. -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
<executions>
<execution>
diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml
index a855d84de71..a1dd174d4e1 100644
--- a/config-proxy/pom.xml
+++ b/config-proxy/pom.xml
@@ -91,17 +91,6 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<finalName>${project.artifactId}-jar-with-dependencies</finalName>
- <filters>
- <filter>
- <!-- Don't include signature files from bouncycastle in uber jar. -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
<executions>
<execution>
diff --git a/document/pom.xml b/document/pom.xml
index 3faada08553..2b050a4904e 100644
--- a/document/pom.xml
+++ b/document/pom.xml
@@ -81,17 +81,6 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<finalName>${project.artifactId}-jar-with-dependencies</finalName>
- <filters>
- <filter>
- <!-- Don't include signature files from bouncycastle in uber jar. -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.yahoo.document.foo</mainClass>
diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml
index 124703c24b8..e78dec5df9b 100644
--- a/filedistribution/pom.xml
+++ b/filedistribution/pom.xml
@@ -102,17 +102,6 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<finalName>${project.artifactId}-jar-with-dependencies</finalName>
- <filters>
- <filter>
- <!-- Don't include signature files from bouncycastle in uber jar. -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
<executions>
<execution>
diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml
index 86dc9f0fbb8..efca7479faf 100644
--- a/indexinglanguage/pom.xml
+++ b/indexinglanguage/pom.xml
@@ -65,17 +65,6 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<finalName>${project.artifactId}-jar-with-dependencies</finalName>
- <filters>
- <filter>
- <!-- Don't include signature files from bouncycastle in uber jar. -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
<executions>
<execution>
diff --git a/logserver/pom.xml b/logserver/pom.xml
index 19f422f3a86..27381f7aa42 100644
--- a/logserver/pom.xml
+++ b/logserver/pom.xml
@@ -63,17 +63,6 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<finalName>${project.artifactId}-jar-with-dependencies</finalName>
- <filters>
- <filter>
- <!-- Don't include signature files from bouncycastle in uber jar. -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.yahoo.logserver.Server</mainClass>
diff --git a/messagebus/pom.xml b/messagebus/pom.xml
index ff55a4eca96..a59499b97e1 100644
--- a/messagebus/pom.xml
+++ b/messagebus/pom.xml
@@ -67,17 +67,6 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<finalName>${project.artifactId}-jar-with-dependencies</finalName>
- <filters>
- <filter>
- <!-- Don't include signature files from bouncycastle in uber jar. -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
<executions>
<execution>
diff --git a/parent/pom.xml b/parent/pom.xml
index 2ec0a975c8e..cac01fc6d5e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -172,6 +172,30 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
+ <configuration>
+ <filters>
+ <filter>
+ <!-- Filter out files that are known to cause issues and warnings. -->
+ <!-- WARNING: Adding a custom filter in a module's pom will disable this filter! -->
+ <artifact>*:*</artifact>
+ <excludes>
+ <!-- Silence warning about "breaking its strong encapsulation" -->
+ <exclude>module-info.class</exclude>
+ <!-- Multi-release jars -->
+ <exclude>META-INF/versions/*/module-info.class</exclude>
+ <!-- License and notices files -->
+ <exclude>META-INF/LICENSE*</exclude>
+ <exclude>META-INF/NOTICE*</exclude>
+ <!-- E.g. bundle manifests -->
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <!-- Signature files, from e.g. bouncycastle -->
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/security-tools/pom.xml b/security-tools/pom.xml
index 7f5d22b4b2b..f4511110fb7 100644
--- a/security-tools/pom.xml
+++ b/security-tools/pom.xml
@@ -49,18 +49,6 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<finalName>${project.artifactId}-jar-with-dependencies</finalName>
- <filters>
- <filter>
- <!-- Don't include signature files from bouncycastle in uber jar. -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- <exclude>META-INF/versions/*/module-info.class</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
<executions>
<execution>
diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml
index 3cf669f924a..1a09fc2e780 100644
--- a/vespa-hadoop/pom.xml
+++ b/vespa-hadoop/pom.xml
@@ -187,16 +187,6 @@
<shadedPattern>shaded.vespa</shadedPattern>
</relocation>
</relocations>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml
index b25f54362ed..c4f7fd95ffd 100644
--- a/vespa-http-client/pom.xml
+++ b/vespa-http-client/pom.xml
@@ -170,17 +170,6 @@
</goals>
<configuration>
<outputFile>target/${project.artifactId}-jar-with-dependencies.jar</outputFile>
- <filters>
- <filter>
- <!-- Don't include signature files in uber jar (most likely from bouncycastle). -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.yahoo.vespa.http.client.runner.Runner</mainClass>
diff --git a/vespa_feed_perf/pom.xml b/vespa_feed_perf/pom.xml
index 6c25b4f6329..a8168b6c4f7 100644
--- a/vespa_feed_perf/pom.xml
+++ b/vespa_feed_perf/pom.xml
@@ -62,17 +62,6 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<finalName>${project.artifactId}-jar-with-dependencies</finalName>
- <filters>
- <filter>
- <!-- Don't include signature files from bouncycastle in uber jar. -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.yahoo.vespa.feed.perf.SimpleFeeder</mainClass>
diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml
index d8530fd9d82..0db7c523eb5 100644
--- a/vespaclient-java/pom.xml
+++ b/vespaclient-java/pom.xml
@@ -75,17 +75,6 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<finalName>${project.artifactId}-jar-with-dependencies</finalName>
- <filters>
- <filter>
- <!-- Don't include signature files in uber jar (most likely from bouncycastle). -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
<executions>
<execution>