diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-06-08 13:40:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-08 13:40:36 +0200 |
| commit | 14ceb2e5596a30d63a0ae3ea6262f2f41bed93e7 (patch) | |
| tree | aca4d958553771a589ec9c423f11725460a5d011 /container-disc/pom.xml | |
| parent | bba749743bc02b396298579fdf4e076bc8f8c196 (diff) | |
| parent | c264cd1c50c81a46eaf11c52a144274bf8cc2f95 (diff) | |
Merge pull request #22993 from vespa-engine/8
8 MERGEOK
Diffstat (limited to 'container-disc/pom.xml')
| -rw-r--r-- | container-disc/pom.xml | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index a94225f6b5e..ad6092ad05a 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -8,11 +8,11 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> - <version>7-SNAPSHOT</version> + <version>8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-disc</artifactId> - <version>7-SNAPSHOT</version> + <version>8-SNAPSHOT</version> <packaging>container-plugin</packaging> <dependencies> <dependency> @@ -71,10 +71,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>component</artifactId> <version>${project.version}</version> @@ -250,28 +246,14 @@ asm-util-${asm.version}.jar, <!-- Spifly end --> - <!-- Jersey 2 + Jackson 2 --> - aopalliance-repackaged-${hk2.version}.jar, - hk2-api-${hk2.version}.jar, - hk2-locator-${hk2.version}.jar, - hk2-utils-${hk2.version}.jar, jackson-annotations-${jackson2.version}.jar, jackson-core-${jackson2.version}.jar, jackson-databind-${jackson-databind.version}.jar, jackson-datatype-jdk8-${jackson2.version}.jar, jackson-datatype-jsr310-${jackson2.version}.jar, - jackson-jaxrs-base-${jackson2.version}.jar, - jackson-jaxrs-json-provider-${jackson2.version}.jar, - jackson-module-jaxb-annotations-${jackson2.version}.jar, - javassist-${javassist.version}.jar, - javax.ws.rs-api-${javax.ws.rs-api.version}.jar, - jersey-client-${jersey2.version}.jar, - jersey-common-${jersey2.version}.jar, - jersey-guava-${jersey2.version}.jar, - jersey-server-${jersey2.version}.jar, - osgi-resource-locator-1.0.1.jar, - validation-api-1.1.0.Final.jar - <!-- jersey2 end --> + + <!-- Only one instance of javax.ws.rs.client.ClientBuilder can be loaded by the JVM --> + javax.ws.rs-api-${javax.ws.rs-api.version}.jar </discPreInstallBundle> </configuration> </plugin> |