diff options
author | gjoranv <gv@verizonmedia.com> | 2021-07-21 18:45:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-21 18:45:52 +0200 |
commit | 3deea4d64b5e51158d631bab54ba918438af5dc8 (patch) | |
tree | 9b8d1740f777dc40d790a7386177144d3845cf9e | |
parent | 6a1fc15cbb6ed6ff8c63fc8d1043bf97a3d48ea6 (diff) | |
parent | 30661491e4d16756993a37c4343d6a4074084a4b (diff) |
Merge pull request #18640 from vespa-engine/remove-jersey-servlet-and-jaxb
Remove jersey servlet and jaxb [run-systemtest]
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 3 | ||||
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 3 | ||||
-rw-r--r-- | container-dependency-versions/pom.xml | 15 | ||||
-rw-r--r-- | container-disc/pom.xml | 5 | ||||
-rw-r--r-- | vespa_jersey2/pom.xml | 29 |
5 files changed, 22 insertions, 33 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 481211390e0..ab8c9b7d136 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -120,14 +120,11 @@ <include>org.glassfish.hk2:hk2-utils:[${hk2.version}]:jar:provided</include> <include>org.glassfish.hk2:osgi-resource-locator:[${hk2.osgi-resource-locator.version}]:jar:provided</include> <include>org.glassfish.jersey.bundles.repackaged:jersey-guava:[${jersey2.version}]:jar:provided</include> - <include>org.glassfish.jersey.containers:jersey-container-servlet-core:[${jersey2.version}]:jar:provided</include> - <include>org.glassfish.jersey.containers:jersey-container-servlet:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.core:jersey-client:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.core:jersey-common:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.core:jersey-server:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.ext:jersey-entity-filtering:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.ext:jersey-proxy-client:[${jersey2.version}]:jar:provided</include> - <include>org.glassfish.jersey.media:jersey-media-jaxb:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.media:jersey-media-json-jackson:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.media:jersey-media-multipart:[${jersey2.version}]:jar:provided</include> <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index d692adac3c3..762318c8306 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -113,14 +113,11 @@ <include>org.glassfish.hk2:hk2-utils:[${hk2.version}]:jar:provided</include> <include>org.glassfish.hk2:osgi-resource-locator:[${hk2.osgi-resource-locator.version}]:jar:provided</include> <include>org.glassfish.jersey.bundles.repackaged:jersey-guava:[${jersey2.version}]:jar:provided</include> - <include>org.glassfish.jersey.containers:jersey-container-servlet-core:[${jersey2.version}]:jar:provided</include> - <include>org.glassfish.jersey.containers:jersey-container-servlet:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.core:jersey-client:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.core:jersey-common:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.core:jersey-server:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.ext:jersey-entity-filtering:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.ext:jersey-proxy-client:[${jersey2.version}]:jar:provided</include> - <include>org.glassfish.jersey.media:jersey-media-jaxb:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.media:jersey-media-json-jackson:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.media:jersey-media-multipart:[${jersey2.version}]:jar:provided</include> <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 29e9f85256d..30af057b119 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -253,16 +253,6 @@ <version>${jersey2.version}</version> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> <version>${jersey2.version}</version> @@ -289,11 +279,6 @@ </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-jaxb</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> <version>${jersey2.version}</version> </dependency> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index b255b6af02a..d3beb67c2de 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -229,11 +229,8 @@ javax.ws.rs-api-${javax.ws.rs-api.version}.jar, jersey-client-${jersey2.version}.jar, jersey-common-${jersey2.version}.jar, - jersey-container-servlet-${jersey2.version}.jar, - jersey-container-servlet-core-${jersey2.version}.jar, - jersey-entity-filtering-${jersey2.version}.jar, <!-- new feature from 2.16, provided for convenience --> + jersey-entity-filtering-${jersey2.version}.jar, <!-- needed by media-json-jackson --> jersey-guava-${jersey2.version}.jar, - jersey-media-jaxb-${jersey2.version}.jar, jersey-media-json-jackson-${jersey2.version}.jar, jersey-media-multipart-${jersey2.version}.jar, mimepull-${mimepull.version}.jar, <!-- needed by media-multipart --> diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index c39b92cd371..9d3c00aebd5 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -20,14 +20,6 @@ <artifactId>javax.ws.rs-api</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet</artifactId> - </dependency> - <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> <exclusions> @@ -63,6 +55,27 @@ <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> </dependency> + + <dependency> + <!-- Previously pulled in by jersey-container-servlet-core. Contains packages imported by + jersey-entity-filtering, which is used by jersey-media-json-jackson, which is again useed by hosted Vespa + framework bundles, July 2021. --> + <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> + <!-- Previously pulled in by jersey-container-servlet-core. + Contains packages imported by hosted user applications, July 2021. --> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> </dependencies> <build> |