Revert "Merge pull request #22392 from vespa-engine/revert-22390-jonmv/export-package"

This reverts commit 3a757528a0a978d44cb1bd9aae28b567c477d139, reversing
changes made to ea6f91775e837040dc5debad521e446f389ed8ab.

7 files changed, 31 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5caa36e4fe0..0eb126901b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,7 @@ add_subdirectory(flags)
 add_subdirectory(fnet)
 add_subdirectory(fsa)
 add_subdirectory(hosted-zone-api)
+add_subdirectory(http-client)
 add_subdirectory(jdisc-cloud-aws)
 add_subdirectory(jdisc_core)
 add_subdirectory(jdisc-security-filters)
diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt
index a91e3f8348b..c2752da57b4 100644
--- a/configserver/CMakeLists.txt
+++ b/configserver/CMakeLists.txt
@@ -16,6 +16,7 @@ install_symlink(lib/jars/athenz-identity-provider-service-jar-with-dependencies.
 install_symlink(lib/jars/config-model-fat.jar conf/configserver-app/components/config-model-fat.jar)
 install_symlink(lib/jars/configserver-flags-jar-with-dependencies.jar conf/configserver-app/components/configserver-flags.jar)
 install_symlink(lib/jars/flags-jar-with-dependencies.jar conf/configserver-app/components/flags.jar)
+install_symlink(lib/jars/http-client-jar-with-dependencies.jar conf/configserver-app/components/http-client.jar)
 install_symlink(lib/jars/orchestrator-jar-with-dependencies.jar conf/configserver-app/components/orchestrator.jar)
 install_symlink(lib/jars/service-monitor-jar-with-dependencies.jar conf/configserver-app/components/service-monitor.jar)
 install_symlink(lib/jars/application-model-jar-with-dependencies.jar conf/configserver-app/components/application-model.jar)
diff --git a/hosted-zone-api/pom.xml b/hosted-zone-api/pom.xml
index e061ff18082..ea3b035618b 100644
--- a/hosted-zone-api/pom.xml
+++ b/hosted-zone-api/pom.xml
@@ -10,7 +10,6 @@
   </parent>
   <artifactId>hosted-zone-api</artifactId>
   <packaging>container-plugin</packaging>
-  <version>7-SNAPSHOT</version>
 
   <dependencies>
     <!-- provided -->
diff --git a/http-client/CMakeLists.txt b/http-client/CMakeLists.txt
new file mode 100644
index 00000000000..3f5bf469481
--- /dev/null
+++ b/http-client/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+install_fat_java_artifact(http-client)
diff --git a/http-client/pom.xml b/http-client/pom.xml
index ebe83a80903..75e9bdc27cb 100644
--- a/http-client/pom.xml
+++ b/http-client/pom.xml
@@ -11,6 +11,7 @@
         <version>7-SNAPSHOT</version>
 	<relativePath>../parent/pom.xml</relativePath>
     </parent>
+    <packaging>container-plugin</packaging>
     <artifactId>http-client</artifactId>
     <description>HTTP client wrapper around an Apache http client 5</description>
 
@@ -24,6 +25,12 @@
 
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
+            <artifactId>annotations</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
             <artifactId>container-apache-http-client-bundle</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -59,5 +66,20 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.yahoo.vespa</groupId>
+                <artifactId>bundle-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
 
diff --git a/http-client/src/main/java/ai/vespa/hosted/client/package-info.java b/http-client/src/main/java/ai/vespa/hosted/client/package-info.java
new file mode 100644
index 00000000000..bfabf9ade4f
--- /dev/null
+++ b/http-client/src/main/java/ai/vespa/hosted/client/package-info.java
@@ -0,0 +1,5 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+@ExportPackage
+package ai.vespa.hosted.client;
+
+import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml
index 1ac1bf6ec22..12d87f6bc07 100644
--- a/orchestrator/pom.xml
+++ b/orchestrator/pom.xml
@@ -117,12 +117,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <!-- Provided by the configserver bundle -->
-      <groupId>org.glassfish.jersey.ext</groupId>
-      <artifactId>jersey-proxy-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
       <version>${jackson2.version}</version>