Remove deps to http-utils and add vespajlib where necessary.

10 files changed, 7 insertions, 53 deletions

diff --git a/config-model/pom.xml b/config-model/pom.xml
index 0059d8067e4..926c53039d2 100644
--- a/config-model/pom.xml
+++ b/config-model/pom.xml
@@ -108,10 +108,6 @@
       <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 8355587c10b..c3ecc90ad02 100755
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -63,12 +63,6 @@
       <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 39005c9ccab..3e9f3d3fcf0 100644
--- a/configserver-client/pom.xml
+++ b/configserver-client/pom.xml
@@ -17,13 +17,6 @@
     <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 ac98cfa5d5d..fa67bebef91 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -242,12 +242,6 @@
       <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 3627e3f37a7..590201171ac 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -59,11 +59,6 @@
     </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 a0d05588a0d..3ee48ed2efc 100644
--- a/controller-server/pom.xml
+++ b/controller-server/pom.xml
@@ -158,13 +158,6 @@
         </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 19b545df616..2a9e3cebf3a 100644
--- a/metrics-proxy/pom.xml
+++ b/metrics-proxy/pom.xml
@@ -99,11 +99,6 @@
     <!-- 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 2c17fb9ca5d..a09c4865ec0 100644
--- a/node-repository/pom.xml
+++ b/node-repository/pom.xml
@@ -84,12 +84,6 @@
             <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 df28737f352..0bdce4a2176 100644
--- a/service-monitor/pom.xml
+++ b/service-monitor/pom.xml
@@ -16,12 +16,6 @@
     <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>
@@ -91,6 +85,12 @@
             <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 19161e720ba..9298c2becf6 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>http-utils</artifactId>
+      <artifactId>vespajlib</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>