diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-01-24 18:58:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-24 18:58:58 +0100 |
commit | 1ef8e73ab5ef6ea72297bed35ecc1f0f0703c46f (patch) | |
tree | ab772b77fed05e050b16c471950a79896b0a294b | |
parent | 4e54a8cf76b8b472b20645b7dd0a2036e5637e3d (diff) |
Revert "Bjorncs/bundle cleanup [run-systemtest]" (#25713)
-rw-r--r-- | clustercontroller-utils/pom.xml | 1 | ||||
-rw-r--r-- | config-application-package/pom.xml | 26 | ||||
-rw-r--r-- | configserver/pom.xml | 4 | ||||
-rw-r--r-- | dist/vespa.spec | 1 | ||||
-rw-r--r-- | filedistribution/CMakeLists.txt | 1 | ||||
-rw-r--r-- | filedistribution/pom.xml | 23 | ||||
-rw-r--r-- | jdisc-cloud-aws/pom.xml | 9 | ||||
-rw-r--r-- | node-admin/pom.xml | 15 |
8 files changed, 57 insertions, 23 deletions
diff --git a/clustercontroller-utils/pom.xml b/clustercontroller-utils/pom.xml index 8b2e4ab484f..381a4c88946 100644 --- a/clustercontroller-utils/pom.xml +++ b/clustercontroller-utils/pom.xml @@ -16,7 +16,6 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml index 251bfae07bf..dc2c8d91db1 100644 --- a/config-application-package/pom.xml +++ b/config-application-package/pom.xml @@ -10,7 +10,7 @@ <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>config-application-package</artifactId> - <packaging>jar</packaging> + <packaging>container-plugin</packaging> <version>8-SNAPSHOT</version> <dependencies> <dependency> @@ -97,7 +97,6 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -114,6 +113,11 @@ <build> <plugins> <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> @@ -135,6 +139,24 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/configserver/pom.xml b/configserver/pom.xml index e05e1f5e5ba..ef0fde3e57e 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -32,10 +32,6 @@ <groupId>jakarta.xml.bind</groupId> <artifactId>jakarta.xml.bind-api</artifactId> </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>*</artifactId> - </exclusion> </exclusions> </dependency> <dependency> diff --git a/dist/vespa.spec b/dist/vespa.spec index 4e05a0b7fb0..24db766bbea 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -589,6 +589,7 @@ fi %{_prefix}/lib/jars/configserver-flags-jar-with-dependencies.jar %{_prefix}/lib/jars/configserver-jar-with-dependencies.jar %{_prefix}/lib/jars/document.jar +%{_prefix}/lib/jars/filedistribution-jar-with-dependencies.jar %{_prefix}/lib/jars/http-client-jar-with-dependencies.jar %{_prefix}/lib/jars/logserver-jar-with-dependencies.jar %{_prefix}/lib/jars/metrics-proxy-jar-with-dependencies.jar diff --git a/filedistribution/CMakeLists.txt b/filedistribution/CMakeLists.txt index 05c9ec571fb..73c581c0b7f 100644 --- a/filedistribution/CMakeLists.txt +++ b/filedistribution/CMakeLists.txt @@ -1 +1,2 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_jar(filedistribution-jar-with-dependencies.jar) diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index a2dd5081c48..6485919b14b 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -14,7 +14,7 @@ <artifactId>filedistribution</artifactId> <version>8-SNAPSHOT</version> - <packaging>jar</packaging> + <packaging>container-plugin</packaging> <name>${project.artifactId}</name> <dependencies> @@ -56,9 +56,30 @@ <build> <plugins> <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <configuration> + <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml index 5d749084eaf..5ae3e056309 100644 --- a/jdisc-cloud-aws/pom.xml +++ b/jdisc-cloud-aws/pom.xml @@ -37,10 +37,6 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>*</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -63,11 +59,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <scope>provided</scope> - </dependency> </dependencies> <build> diff --git a/node-admin/pom.xml b/node-admin/pom.xml index 90bb72efbcd..598e0233da0 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -53,12 +53,6 @@ <artifactId>jackson-annotations</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> <!-- Compile --> <dependency> @@ -67,6 +61,15 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + <dependency> + <!-- TODO Use container-apache-http-client-bundle --> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity-engine-core</artifactId> <exclusions> |