diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-03-12 22:47:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-12 22:47:54 +0100 |
| commit | 3112ce77183ccaa560617b60dc2e38abb2afa678 (patch) | |
| tree | 9539120222d354bc968912127538b8043fe15973 /configserver | |
| parent | c4ac024bfedb431acf2472c883d1d3712a24c506 (diff) | |
| parent | e96cc2369aaeb5a1eab33996abacbc12a147583c (diff) | |
Merge pull request #21664 from vespa-engine/use-my-own-jersey-for-configserver
Let configserver use its own embedded Jersey deps [run-systemtest]
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/pom.xml | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index e81d1d5d970..d7702799dec 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -155,19 +155,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespa_jersey2</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <scope>provided</scope> @@ -199,7 +186,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>serviceview</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -222,10 +208,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.glassfish.jersey.ext</groupId> - <artifactId>jersey-proxy-client</artifactId> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> @@ -234,8 +216,32 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>http-utils</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> + + <!-- Jersey, needed by serviceview --> + <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> + </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> + </dependency> + <!-- Jersey END --> + </dependencies> <build> <plugins> |