diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-03-29 22:55:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 22:55:22 +0200 |
| commit | 7837024f2d7ab63b4e9b0346660373a49a568e4a (patch) | |
| tree | 87c3fc8c92049c1b9434965d7d41e5b792cc7d8a | |
| parent | a5737afdd4a83a11504b26b3aab1c6307ef9507d (diff) | |
| parent | 929869ccae4912878d5a91f22c7849b23c9c2853 (diff) | |
Merge pull request #21885 from vespa-engine/remove-jersey-proxy-client
Remove jersey proxy client [run-systemtest]
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 1 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 1 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | container-disc/pom.xml | 1 | ||||
| -rw-r--r-- | vespa_jersey2/pom.xml | 4 |
5 files changed, 1 insertions, 8 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 77a3a9958ec..21e5de31534 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -122,7 +122,6 @@ <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-proxy-client:[${jersey2.version}]:jar:provided</include> <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include> <include>org.json:json:[${org.json.version}]:jar:provided</include> <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 7465d486013..211d0019774 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -106,7 +106,6 @@ <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-proxy-client:[${jersey2.version}]:jar:provided</include> <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include> <include>org.json:json:[${org.json.version}]:jar:provided</include> <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index ea1aad851fa..f4dcfeab9d3 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -29,7 +29,7 @@ </scm> <dependencyManagement> - <!-- TODO Vespa 8: remove all artifacts to parent that are no longer installed in jdisc. + <!-- TODO Vespa 8: remove all artifacts that are no longer installed in jdisc. Those used in configserver/controller must be moved to parent/pom.xml --> <dependencies> <dependency> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 732f873d9a0..a64349855b1 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -254,7 +254,6 @@ jersey-common-${jersey2.version}.jar, jersey-guava-${jersey2.version}.jar, jersey-server-${jersey2.version}.jar, - jersey-proxy-client-${jersey2.version}.jar, osgi-resource-locator-1.0.1.jar, validation-api-1.1.0.Final.jar <!-- jersey2 end --> diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index f8904378901..bcea7604d9b 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -20,10 +20,6 @@ <artifactId>javax.ws.rs-api</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.ext</groupId> - <artifactId>jersey-proxy-client</artifactId> - </dependency> - <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> </dependency> |