diff options
-rw-r--r-- | application-preprocessor/pom.xml | 1 | ||||
-rw-r--r-- | client/pom.xml | 1 | ||||
-rw-r--r-- | config-proxy/pom.xml | 1 | ||||
-rw-r--r-- | document/pom.xml | 20 | ||||
-rw-r--r-- | filedistribution/pom.xml | 1 | ||||
-rw-r--r-- | indexinglanguage/pom.xml | 22 | ||||
-rw-r--r-- | logserver/pom.xml | 1 | ||||
-rw-r--r-- | messagebus/pom.xml | 1 | ||||
-rw-r--r-- | security-tools/pom.xml | 1 | ||||
-rw-r--r-- | vespa-http-client/pom.xml | 3 | ||||
-rw-r--r-- | vespa_feed_perf/pom.xml | 1 | ||||
-rw-r--r-- | vespaclient-java/pom.xml | 1 |
12 files changed, 11 insertions, 43 deletions
diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml index 45989770da9..644903e79dd 100644 --- a/application-preprocessor/pom.xml +++ b/application-preprocessor/pom.xml @@ -75,6 +75,7 @@ <artifactId>maven-shade-plugin</artifactId> <configuration> <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> </configuration> <executions> <execution> diff --git a/client/pom.xml b/client/pom.xml index ea33b9f3adf..190b0a4a73f 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -48,6 +48,7 @@ <artifactId>maven-shade-plugin</artifactId> <configuration> <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> </configuration> <executions> <execution> diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index a1dd174d4e1..95cbac62dda 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -91,6 +91,7 @@ <artifactId>maven-shade-plugin</artifactId> <configuration> <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> </configuration> <executions> <execution> diff --git a/document/pom.xml b/document/pom.xml index 2b050a4904e..2a284f709db 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -77,26 +77,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <configuration> - <finalName>${project.artifactId}-jar-with-dependencies</finalName> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>com.yahoo.document.foo</mainClass> - </transformer> - </transformers> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>com.helger.maven</groupId> <artifactId>ph-javacc-maven-plugin</artifactId> </plugin> diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index e78dec5df9b..9dca254cebe 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -102,6 +102,7 @@ <artifactId>maven-shade-plugin</artifactId> <configuration> <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> </configuration> <executions> <execution> diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index f9ee18a4602..112dcee5136 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -60,31 +60,9 @@ <artifactId>maven-surefire-plugin</artifactId> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <configuration> - <finalName>${project.artifactId}-jar-with-dependencies</finalName> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>com.helger.maven</groupId> <artifactId>ph-javacc-maven-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> - </plugin> </plugins> </build> </project> diff --git a/logserver/pom.xml b/logserver/pom.xml index 27381f7aa42..409f3e51217 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -63,6 +63,7 @@ <artifactId>maven-shade-plugin</artifactId> <configuration> <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> <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 a59499b97e1..369d751ca9a 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -67,6 +67,7 @@ <artifactId>maven-shade-plugin</artifactId> <configuration> <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> </configuration> <executions> <execution> diff --git a/security-tools/pom.xml b/security-tools/pom.xml index f4511110fb7..424b5002d1d 100644 --- a/security-tools/pom.xml +++ b/security-tools/pom.xml @@ -49,6 +49,7 @@ <artifactId>maven-shade-plugin</artifactId> <configuration> <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> </configuration> <executions> <execution> diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml index c4f7fd95ffd..0448b2b862b 100644 --- a/vespa-http-client/pom.xml +++ b/vespa-http-client/pom.xml @@ -169,7 +169,8 @@ <goal>shade</goal> </goals> <configuration> - <outputFile>target/${project.artifactId}-jar-with-dependencies.jar</outputFile> + <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> <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 a8168b6c4f7..31fae41a357 100644 --- a/vespa_feed_perf/pom.xml +++ b/vespa_feed_perf/pom.xml @@ -62,6 +62,7 @@ <artifactId>maven-shade-plugin</artifactId> <configuration> <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> <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 0db7c523eb5..3a0c52fc462 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -75,6 +75,7 @@ <artifactId>maven-shade-plugin</artifactId> <configuration> <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> </configuration> <executions> <execution> |