diff options
| -rw-r--r-- | application-preprocessor/pom.xml | 6 | ||||
| -rw-r--r-- | config-proxy/pom.xml | 6 | ||||
| -rw-r--r-- | document/pom.xml | 6 | ||||
| -rw-r--r-- | filedistribution/pom.xml | 6 | ||||
| -rw-r--r-- | indexinglanguage/pom.xml | 6 | ||||
| -rw-r--r-- | logserver/pom.xml | 6 | ||||
| -rw-r--r-- | messagebus/pom.xml | 6 | ||||
| -rw-r--r-- | security-tools/pom.xml | 7 | ||||
| -rw-r--r-- | vespa-hadoop/pom.xml | 5 | ||||
| -rw-r--r-- | vespa-http-client/pom.xml | 6 | ||||
| -rw-r--r-- | vespa_feed_perf/pom.xml | 6 | ||||
| -rw-r--r-- | vespaclient-java/pom.xml | 6 |
12 files changed, 24 insertions, 48 deletions
diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml index a021577f838..53d8c6f1849 100644 --- a/application-preprocessor/pom.xml +++ b/application-preprocessor/pom.xml @@ -77,12 +77,10 @@ <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/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index a855d84de71..2e6634b1f7c 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -93,12 +93,10 @@ <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/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> diff --git a/document/pom.xml b/document/pom.xml index 3faada08553..e2b9335ddc2 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -83,12 +83,10 @@ <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/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index 124703c24b8..aa256d0a291 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -104,12 +104,10 @@ <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/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index 86dc9f0fbb8..535de8858ea 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -67,12 +67,10 @@ <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/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> diff --git a/logserver/pom.xml b/logserver/pom.xml index 19f422f3a86..ca1a891633d 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -65,12 +65,10 @@ <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/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> diff --git a/messagebus/pom.xml b/messagebus/pom.xml index ff55a4eca96..124368cb136 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -69,12 +69,10 @@ <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/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> diff --git a/security-tools/pom.xml b/security-tools/pom.xml index 7f5d22b4b2b..ad5aa73d546 100644 --- a/security-tools/pom.xml +++ b/security-tools/pom.xml @@ -51,13 +51,10 @@ <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> + <exclude>META-INF/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index 3cf669f924a..42c5525c321 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -191,9 +191,8 @@ <filter> <artifact>*:*</artifact> <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> + <exclude>META-INF/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml index b25f54362ed..f2a21a259b0 100644 --- a/vespa-http-client/pom.xml +++ b/vespa-http-client/pom.xml @@ -172,12 +172,10 @@ <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> + <exclude>META-INF/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> diff --git a/vespa_feed_perf/pom.xml b/vespa_feed_perf/pom.xml index 6c25b4f6329..25b57cdcbc9 100644 --- a/vespa_feed_perf/pom.xml +++ b/vespa_feed_perf/pom.xml @@ -64,12 +64,10 @@ <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/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index d8530fd9d82..57f0a0b6125 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -77,12 +77,10 @@ <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> + <exclude>META-INF/**</exclude> + <exclude>module-info.class</exclude> </excludes> </filter> </filters> |