summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cloud-tenant-base-dependencies-enforcer/pom.xml1
-rw-r--r--container-dependencies-enforcer/pom.xml1
-rw-r--r--container-dependency-versions/pom.xml2
-rw-r--r--container-disc/pom.xml1
-rw-r--r--vespa_jersey2/pom.xml4
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>