aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-model/pom.xml4
-rwxr-xr-xconfig/pom.xml6
-rw-r--r--configserver-client/pom.xml7
-rw-r--r--configserver/pom.xml6
-rw-r--r--container-core/pom.xml5
-rw-r--r--controller-server/pom.xml7
-rw-r--r--metrics-proxy/pom.xml5
-rw-r--r--node-repository/pom.xml6
-rw-r--r--service-monitor/pom.xml12
-rw-r--r--vespa-http-client/pom.xml2
10 files changed, 53 insertions, 7 deletions
diff --git a/config-model/pom.xml b/config-model/pom.xml
index 6dfc2e7740f..18b8432645e 100644
--- a/config-model/pom.xml
+++ b/config-model/pom.xml
@@ -108,6 +108,10 @@
<exclusions>
<!-- Not needed to generate config and saves 1 MB. -->
<exclusion>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>http-utils</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
diff --git a/config/pom.xml b/config/pom.xml
index 423f0b496e1..05b0bd758f8 100755
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -63,6 +63,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>http-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
diff --git a/configserver-client/pom.xml b/configserver-client/pom.xml
index 9e00347d60c..91ac43c72f6 100644
--- a/configserver-client/pom.xml
+++ b/configserver-client/pom.xml
@@ -17,6 +17,13 @@
<dependencies>
<dependency>
<groupId>com.yahoo.vespa</groupId>
+ <artifactId>http-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yahoo.vespa</groupId>
<artifactId>vespa-athenz</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
diff --git a/configserver/pom.xml b/configserver/pom.xml
index 59d414ca393..21db8f9a966 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -242,6 +242,12 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>http-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/container-core/pom.xml b/container-core/pom.xml
index 91b81977f67..8e3c700628a 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -59,6 +59,11 @@
</dependency>
<dependency>
<groupId>com.yahoo.vespa</groupId>
+ <artifactId>http-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.yahoo.vespa</groupId>
<artifactId>linguistics</artifactId>
<version>${project.version}</version>
<exclusions>
diff --git a/controller-server/pom.xml b/controller-server/pom.xml
index 8615b8672c1..3b2949f6964 100644
--- a/controller-server/pom.xml
+++ b/controller-server/pom.xml
@@ -158,6 +158,13 @@
</dependency>
<dependency>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>http-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<!-- required by java-jwt -->
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml
index 6e43b6c1d62..1633d78668b 100644
--- a/metrics-proxy/pom.xml
+++ b/metrics-proxy/pom.xml
@@ -99,6 +99,11 @@
<!-- compile scope -->
<dependency>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>http-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
</dependency>
diff --git a/node-repository/pom.xml b/node-repository/pom.xml
index 1732499d835..72a303b237d 100644
--- a/node-repository/pom.xml
+++ b/node-repository/pom.xml
@@ -84,6 +84,12 @@
<version>6.0.4</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>http-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
<!-- test -->
<dependency>
diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml
index 47073049403..b8ac12ebb4e 100644
--- a/service-monitor/pom.xml
+++ b/service-monitor/pom.xml
@@ -16,6 +16,12 @@
<description>Service monitor component for hosted vespa.</description>
<dependencies>
+ <dependency>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>http-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
<!-- provided scope -->
<dependency>
@@ -85,12 +91,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.yahoo.vespa</groupId>
- <artifactId>vespajlib</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<scope>provided</scope>
diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml
index 7028b1802ed..fa73dd1bd74 100644
--- a/vespa-http-client/pom.xml
+++ b/vespa-http-client/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<!-- Needed for Vespa TLS configuration. Standard jar artifact -->
<groupId>com.yahoo.vespa</groupId>
- <artifactId>vespajlib</artifactId>
+ <artifactId>http-utils</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<exclusions>