Merge pull request #25750 from vespa-engine/bjorncs/reapply

Bjorncs/reapply

5 files changed, 9 insertions, 57 deletions

diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml
index dc2c8d91db1..251bfae07bf 100644
--- a/config-application-package/pom.xml
+++ b/config-application-package/pom.xml
@@ -10,7 +10,7 @@
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <artifactId>config-application-package</artifactId>
-    <packaging>container-plugin</packaging>
+    <packaging>jar</packaging>
     <version>8-SNAPSHOT</version>
     <dependencies>
         <dependency>
@@ -97,6 +97,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
@@ -113,11 +114,6 @@
     <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>
                 <configuration>
@@ -139,24 +135,6 @@
                 </execution>
               </executions>
            </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <configuration>
-              <descriptorRefs>
-                <descriptorRef>jar-with-dependencies</descriptorRef>
-              </descriptorRefs>
-            </configuration>
-            <executions>
-              <execution>
-                <id>make-assembly</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
     </build>
 </project>
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 24db766bbea..4e05a0b7fb0 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -589,7 +589,6 @@ fi
 %{_prefix}/lib/jars/configserver-flags-jar-with-dependencies.jar
 %{_prefix}/lib/jars/configserver-jar-with-dependencies.jar
 %{_prefix}/lib/jars/document.jar
-%{_prefix}/lib/jars/filedistribution-jar-with-dependencies.jar
 %{_prefix}/lib/jars/http-client-jar-with-dependencies.jar
 %{_prefix}/lib/jars/logserver-jar-with-dependencies.jar
 %{_prefix}/lib/jars/metrics-proxy-jar-with-dependencies.jar
diff --git a/filedistribution/CMakeLists.txt b/filedistribution/CMakeLists.txt
index 73c581c0b7f..05c9ec571fb 100644
--- a/filedistribution/CMakeLists.txt
+++ b/filedistribution/CMakeLists.txt
@@ -1,2 +1 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_jar(filedistribution-jar-with-dependencies.jar)
diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml
index 6485919b14b..a2dd5081c48 100644
--- a/filedistribution/pom.xml
+++ b/filedistribution/pom.xml
@@ -14,7 +14,7 @@
 
     <artifactId>filedistribution</artifactId>
     <version>8-SNAPSHOT</version>
-    <packaging>container-plugin</packaging>
+    <packaging>jar</packaging>
     <name>${project.artifactId}</name>
 
     <dependencies>
@@ -56,30 +56,9 @@
     <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>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <configuration>
-                    <finalName>${project.artifactId}-jar-with-dependencies</finalName>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/node-admin/pom.xml b/node-admin/pom.xml
index 598e0233da0..90bb72efbcd 100644
--- a/node-admin/pom.xml
+++ b/node-admin/pom.xml
@@ -53,6 +53,12 @@
             <artifactId>jackson-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>container-apache-http-client-bundle</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Compile -->
         <dependency>
@@ -61,15 +67,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-        </dependency>
-        <dependency>
-            <!-- TODO Use container-apache-http-client-bundle -->
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
             <exclusions>