diff options
| -rw-r--r-- | application-preprocessor/pom.xml | 20 | ||||
| -rw-r--r-- | clustercontroller-standalone/pom.xml | 21 | ||||
| -rw-r--r-- | document/pom.xml | 30 | ||||
| -rw-r--r-- | filedistribution/pom.xml | 21 | ||||
| -rw-r--r-- | indexinglanguage/pom.xml | 22 | ||||
| -rw-r--r-- | messagebus/pom.xml | 22 | ||||
| -rw-r--r-- | node-maintainer/pom.xml | 21 | ||||
| -rw-r--r-- | vespa_feed_perf/pom.xml | 29 |
8 files changed, 126 insertions, 60 deletions
diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml index 1ef58698ce5..e6371073271 100644 --- a/application-preprocessor/pom.xml +++ b/application-preprocessor/pom.xml @@ -84,18 +84,26 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> + <artifactId>maven-shade-plugin</artifactId> <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + <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> - <id>make-assembly</id> <phase>package</phase> <goals> - <goal>single</goal> + <goal>shade</goal> </goals> </execution> </executions> diff --git a/clustercontroller-standalone/pom.xml b/clustercontroller-standalone/pom.xml index f435cd9d7c4..94b1b3d25c6 100644 --- a/clustercontroller-standalone/pom.xml +++ b/clustercontroller-standalone/pom.xml @@ -87,18 +87,27 @@ </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + <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> - <id>make-assembly-foo</id> <phase>package</phase> <goals> - <goal>single</goal> + <goal>shade</goal> </goals> </execution> </executions> diff --git a/document/pom.xml b/document/pom.xml index 9357e87bb76..6881fd6349a 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -89,24 +89,32 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> <configuration> - <archive> - <manifest> + <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> - </manifest> - </archive> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + </transformer> + </transformers> </configuration> <executions> <execution> - <id>make-assembly</id> <phase>package</phase> - <!-- append to the packaging phase. --> <goals> - <goal>single</goal> + <goal>shade</goal> </goals> </execution> </executions> diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index 6bfa4362f65..7f8e63892b2 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -91,18 +91,27 @@ </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + <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> - <id>make-assembly</id> <phase>package</phase> <goals> - <goal>single</goal> + <goal>shade</goal> </goals> </execution> </executions> diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index 5b234c4695f..7bee8939613 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -69,19 +69,27 @@ <artifactId>maven-surefire-plugin</artifactId> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + <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> - <id>make-assembly</id> <phase>package</phase> - <!-- append to the packaging phase. --> <goals> - <goal>single</goal> + <goal>shade</goal> </goals> </execution> </executions> diff --git a/messagebus/pom.xml b/messagebus/pom.xml index 7c37bccbd9a..0f44d2935ec 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -66,19 +66,27 @@ </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + <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> - <id>make-assembly</id> <phase>package</phase> - <!-- append to the packaging phase. --> <goals> - <goal>single</goal> + <goal>shade</goal> </goals> </execution> </executions> diff --git a/node-maintainer/pom.xml b/node-maintainer/pom.xml index f4e1b399cfa..720fbed2977 100644 --- a/node-maintainer/pom.xml +++ b/node-maintainer/pom.xml @@ -92,19 +92,26 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> + <artifactId>maven-shade-plugin</artifactId> <configuration> - <finalName>node-maintainer</finalName> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + <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> - <id>make-assembly</id> <phase>package</phase> <goals> - <goal>single</goal> + <goal>shade</goal> </goals> </execution> </executions> diff --git a/vespa_feed_perf/pom.xml b/vespa_feed_perf/pom.xml index 436dcc06f3d..dbb0e4cd437 100644 --- a/vespa_feed_perf/pom.xml +++ b/vespa_feed_perf/pom.xml @@ -63,23 +63,32 @@ </resources> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> <configuration> - <archive> - <manifest> + <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> - </manifest> - </archive> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + </transformer> + </transformers> </configuration> <executions> <execution> - <id>make-assembly</id> <phase>package</phase> <goals> - <goal>single</goal> + <goal>shade</goal> </goals> </execution> </executions> |