From 3efe90110355c13393cadd6ad37b4817d1c6704b Mon Sep 17 00:00:00 2001
From: gjoranv <gv@yahooinc.com>
Date: Fri, 30 Jun 2023 12:49:00 +0200
Subject: Do not provide http-utils via container(-dev)

- It does not have any exported apis.
---
 container-dev/pom.xml  |  4 ++++
 container-disc/pom.xml | 10 ++++++++++
 container/pom.xml      |  4 ++++
 3 files changed, 18 insertions(+)

diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index bc87185bf25..d867f31b2f4 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -225,6 +225,10 @@
       <artifactId>config-bundle</artifactId>
       <version>${project.version}</version>
       <exclusions>
+        <exclusion>
+          <groupId>com.yahoo.vespa</groupId>
+          <artifactId>http-utils</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.lz4</groupId>
           <artifactId>lz4-java</artifactId>
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index 16ce99220f1..61ddc882c8c 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -94,6 +94,10 @@
           <groupId>com.yahoo.vespa</groupId>
           <artifactId>config</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.yahoo.vespa</groupId>
+          <artifactId>http-utils</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.bouncycastle</groupId>
           <artifactId>*</artifactId>
@@ -141,6 +145,12 @@
       <artifactId>config-bundle</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.yahoo.vespa</groupId>
+          <artifactId>http-utils</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
diff --git a/container/pom.xml b/container/pom.xml
index 29216b6579c..fa81ba333e1 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -22,6 +22,10 @@
       <artifactId>container-dev</artifactId>
       <version>${project.version}</version>
       <exclusions>
+        <exclusion>
+          <groupId>com.yahoo.vespa</groupId>
+          <artifactId>http-utils</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.bouncycastle</groupId>
           <artifactId>*</artifactId>
-- 
cgit v1.2.3


From 7a13945ff2d951a5b6d3538c0d167754e1dddac1 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@yahooinc.com>
Date: Fri, 30 Jun 2023 13:29:34 +0200
Subject: Add http-utils to container-test after removing from container-dev

---
 cloud-tenant-base-dependencies-enforcer/pom.xml | 2 +-
 container-dependencies-enforcer/pom.xml         | 2 +-
 container-test/pom.xml                          | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 4d022f96520..cc4fcecd755 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -130,7 +130,6 @@
                                         <include>com.yahoo.vespa:fileacquirer:*:provided</include>
                                         <include>com.yahoo.vespa:fsa:*:provided</include>
                                         <include>com.yahoo.vespa:hosted-zone-api:*:provided</include>
-                                        <include>com.yahoo.vespa:http-utils:*:provided</include>
                                         <include>com.yahoo.vespa:jdisc_core:*:provided</include>
                                         <include>com.yahoo.vespa:jrt:*:provided</include>
                                         <include>com.yahoo.vespa:linguistics:*:provided</include>
@@ -160,6 +159,7 @@
                                         <include>com.yahoo.vespa:container-apache-http-client-bundle:*:test</include>
                                         <include>com.yahoo.vespa:container-test:*:test</include>
                                         <include>com.yahoo.vespa:hosted-api:*:test</include>
+                                        <include>com.yahoo.vespa:http-utils:*:test</include>
                                         <include>com.yahoo.vespa:indexinglanguage:*:test</include>
                                         <include>com.yahoo.vespa:logd:*:test</include>
                                         <include>com.yahoo.vespa:metrics-proxy:*:test</include>
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index a016c44f829..5b9f351b448 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -112,7 +112,6 @@
                                         <include>com.yahoo.vespa:fileacquirer:*:provided</include>
                                         <include>com.yahoo.vespa:fsa:*:provided</include>
                                         <include>com.yahoo.vespa:hosted-zone-api:*:provided</include>
-                                        <include>com.yahoo.vespa:http-utils:*:provided</include>
                                         <include>com.yahoo.vespa:jdisc_core:*:provided</include>
                                         <include>com.yahoo.vespa:jrt:*:provided</include>
                                         <include>com.yahoo.vespa:linguistics:*:provided</include>
@@ -140,6 +139,7 @@
                                         <include>com.yahoo.vespa:config-provisioning:*:test</include>
                                         <include>com.yahoo.vespa:container-apache-http-client-bundle:*:test</include>
                                         <include>com.yahoo.vespa:container-test:*:test</include>
+                                        <include>com.yahoo.vespa:http-utils:*:test</include>
                                         <include>com.yahoo.vespa:indexinglanguage:*:test</include>
                                         <include>com.yahoo.vespa:logd:*:test</include>
                                         <include>com.yahoo.vespa:metrics-proxy:*:test</include>
diff --git a/container-test/pom.xml b/container-test/pom.xml
index a0358e79a8f..8f49103b327 100644
--- a/container-test/pom.xml
+++ b/container-test/pom.xml
@@ -47,6 +47,11 @@
       <artifactId>airlift-zstd</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>http-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.ibm.icu</groupId>
       <artifactId>icu4j</artifactId>
-- 
cgit v1.2.3


From 88c3ab07fae71eda1fc31ef7e83fb16826527046 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@yahooinc.com>
Date: Fri, 30 Jun 2023 13:47:26 +0200
Subject: Move http-utils dep from container-test up to application

---
 application/pom.xml    | 5 +++++
 container-test/pom.xml | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/pom.xml b/application/pom.xml
index 236bcb6d81a..6e5c6426220 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -34,6 +34,11 @@
       <artifactId>config-model-api</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>http-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>model-integration</artifactId>
diff --git a/container-test/pom.xml b/container-test/pom.xml
index 8f49103b327..a0358e79a8f 100644
--- a/container-test/pom.xml
+++ b/container-test/pom.xml
@@ -47,11 +47,6 @@
       <artifactId>airlift-zstd</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>http-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.ibm.icu</groupId>
       <artifactId>icu4j</artifactId>
-- 
cgit v1.2.3


From 2eb5baf1fc320eaef8fd8984c6ce9287d37e553c Mon Sep 17 00:00:00 2001
From: gjoranv <gv@yahooinc.com>
Date: Fri, 30 Jun 2023 14:56:03 +0200
Subject: Exclude http-utils from container-dev instead of container-disc

- http-utils must be embedded in container-disc
---
 container-dev/pom.xml  |  4 ++++
 container-disc/pom.xml | 10 ----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index d867f31b2f4..7d5deba4392 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -98,6 +98,10 @@
       <artifactId>container-disc</artifactId>
       <version>${project.version}</version>
       <exclusions>
+        <exclusion>
+          <groupId>com.yahoo.vespa</groupId>
+          <artifactId>http-utils</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpclient</artifactId>
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index 61ddc882c8c..16ce99220f1 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -94,10 +94,6 @@
           <groupId>com.yahoo.vespa</groupId>
           <artifactId>config</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>com.yahoo.vespa</groupId>
-          <artifactId>http-utils</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.bouncycastle</groupId>
           <artifactId>*</artifactId>
@@ -145,12 +141,6 @@
       <artifactId>config-bundle</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>com.yahoo.vespa</groupId>
-          <artifactId>http-utils</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-- 
cgit v1.2.3