diff options
author | gjoranv <gv@verizonmedia.com> | 2021-08-16 11:05:01 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2021-08-16 11:05:01 +0200 |
commit | b6533d00d6d0a1852f9d2e3c1d694eb9fd0c67fb (patch) | |
tree | 24da7cfd8037c34eef9dab91f05fb1537abb76eb | |
parent | 0885348f7b3c4dd728f01370b9fd5196658f0bd5 (diff) |
Remove container-jersey-servlet-deps and bundles.
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
-rw-r--r-- | container-dependency-versions/pom.xml | 10 | ||||
-rw-r--r-- | container-disc/pom.xml | 4 | ||||
-rw-r--r-- | vespa_jersey2/pom.xml | 23 |
5 files changed, 16 insertions, 25 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 481211390e0..11da20ad635 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -120,8 +120,6 @@ <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> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index d692adac3c3..ee0db90a49e 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -113,8 +113,6 @@ <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> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 29e9f85256d..b66def32df8 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> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index b255b6af02a..f437f513276 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -229,9 +229,7 @@ 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 jersey-media-json-jackson --> jersey-guava-${jersey2.version}.jar, jersey-media-jaxb-${jersey2.version}.jar, jersey-media-json-jackson-${jersey2.version}.jar, diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index c39b92cd371..5524323244e 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,21 @@ <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 used by hosted Vespa + framework bundles, July 2021. --> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-server</artifactId> + </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> |