diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-05-03 10:06:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-03 10:06:22 +0200 |
commit | b942ed39f4d06cf714d62235978399910753a5b9 (patch) | |
tree | 0580306ac592b3d68e3aeedb6f3eb22f280f1101 /configserver | |
parent | 9e4c738e9e994124d96cede78449d2d558d4977f (diff) | |
parent | 1eab48590a5b4851953cf204d393e0ca5c393708 (diff) |
Merge pull request #22396 from vespa-engine/jonmv/reapply-more-apache-http-client
Jonmv/reapply more apache http client [run-systemtest]
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/CMakeLists.txt | 1 | ||||
-rw-r--r-- | configserver/pom.xml | 74 |
2 files changed, 1 insertions, 74 deletions
diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt index a91e3f8348b..c2752da57b4 100644 --- a/configserver/CMakeLists.txt +++ b/configserver/CMakeLists.txt @@ -16,6 +16,7 @@ install_symlink(lib/jars/athenz-identity-provider-service-jar-with-dependencies. install_symlink(lib/jars/config-model-fat.jar conf/configserver-app/components/config-model-fat.jar) install_symlink(lib/jars/configserver-flags-jar-with-dependencies.jar conf/configserver-app/components/configserver-flags.jar) install_symlink(lib/jars/flags-jar-with-dependencies.jar conf/configserver-app/components/flags.jar) +install_symlink(lib/jars/http-client-jar-with-dependencies.jar conf/configserver-app/components/http-client.jar) install_symlink(lib/jars/orchestrator-jar-with-dependencies.jar conf/configserver-app/components/orchestrator.jar) install_symlink(lib/jars/service-monitor-jar-with-dependencies.jar conf/configserver-app/components/service-monitor.jar) install_symlink(lib/jars/application-model-jar-with-dependencies.jar conf/configserver-app/components/application-model.jar) diff --git a/configserver/pom.xml b/configserver/pom.xml index 131e4503f6d..99307d1b2b8 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -189,39 +189,11 @@ <scope>provided</scope> </dependency> <dependency> - <!-- Do not remove, as long as this is provided by jdisc and configserver uses jersey-client --> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <!-- Do not remove, as long as this is provided by jdisc and configserver uses jersey-client --> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <exclusions> - <exclusion> - <!-- Conflicts with javax.activation:javax.activation-api:1.2.0, which is "exported" via jdisc_core. --> - <groupId>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</artifactId> - </exclusion> - <exclusion> - <!-- Conflicts with javax.xml.bind:jaxb-api:2.3, which is "exported" via jdisc_core.--> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </dependency> @@ -241,52 +213,6 @@ <version>${project.version}</version> </dependency> - <!-- Jersey, needed by orchestrator --> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <scope>provided</scope> <!-- TODO: Vespa 8: Set to compile if we get rid of the javax.ws.rs-api bundle --> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-server</artifactId> - <exclusions> - <exclusion> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-jaxb</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.ext</groupId> - <artifactId>jersey-proxy-client</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-json-jackson</artifactId> - <exclusions> - <!-- Prevent embedding deps provided by jdisc --> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <!-- Not needed by configserver, but by controller. Also pulls in mimepull. --> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-multipart</artifactId> - </dependency> - <!-- Jersey END --> - </dependencies> <build> <plugins> |