diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-03-29 23:36:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 23:36:39 +0200 |
| commit | 76783ffa212cdb195c9ae93b0d8321156049e6a8 (patch) | |
| tree | fe65dbb4baf470aaf312d9d7e6faff6365f84291 | |
| parent | 7837024f2d7ab63b4e9b0346660373a49a568e4a (diff) | |
| parent | 98d93d60191609f4e8b27919eebde45b3fb20ee0 (diff) | |
Merge pull request #21888 from vespa-engine/revert-21885-remove-jersey-proxy-clientv7.567.26
Revert "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, 8 insertions, 1 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 21e5de31534..77a3a9958ec 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -122,6 +122,7 @@ <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 211d0019774..7465d486013 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -106,6 +106,7 @@ <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 f4dcfeab9d3..ea1aad851fa 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 that are no longer installed in jdisc. + <!-- TODO Vespa 8: remove all artifacts to parent 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 a64349855b1..732f873d9a0 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -254,6 +254,7 @@ 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 bcea7604d9b..f8904378901 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -20,6 +20,10 @@ <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> |