From 1ef8e73ab5ef6ea72297bed35ecc1f0f0703c46f Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <jonmv@users.noreply.github.com>
Date: Tue, 24 Jan 2023 18:58:58 +0100
Subject: Revert "Bjorncs/bundle cleanup [run-systemtest]" (#25713)

---
 filedistribution/CMakeLists.txt |  1 +
 filedistribution/pom.xml        | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'filedistribution')

diff --git a/filedistribution/CMakeLists.txt b/filedistribution/CMakeLists.txt
index 05c9ec571fb..73c581c0b7f 100644
--- a/filedistribution/CMakeLists.txt
+++ b/filedistribution/CMakeLists.txt
@@ -1 +1,2 @@
 # 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 a2dd5081c48..6485919b14b 100644
--- a/filedistribution/pom.xml
+++ b/filedistribution/pom.xml
@@ -14,7 +14,7 @@
 
     <artifactId>filedistribution</artifactId>
     <version>8-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <packaging>container-plugin</packaging>
     <name>${project.artifactId}</name>
 
     <dependencies>
@@ -55,10 +55,31 @@
 
     <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>
 
-- 
cgit v1.2.3