From 11002ce7a74103b5180a7ef7befb5d1fa09ebe83 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorn.christian@seime.no>
Date: Thu, 26 Jan 2023 00:50:51 +0100
Subject: Revert "Revert "Revert "Bjorncs/bundle cleanup [run-systemtest]"""

---
 config-application-package/pom.xml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'config-application-package')

diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml
index 251bfae07bf..dc2c8d91db1 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>jar</packaging>
+    <packaging>container-plugin</packaging>
     <version>8-SNAPSHOT</version>
     <dependencies>
         <dependency>
@@ -97,7 +97,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
@@ -113,6 +112,11 @@
     </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>
@@ -135,6 +139,24 @@
                 </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>
-- 
cgit v1.2.3