From 43a5ab35b4dfd0f4c5dd2bdbbc241345938d3142 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@yahooinc.com>
Date: Tue, 10 Jan 2023 17:35:00 +0100
Subject: Don't embed JARs installed in lib/jars

Define installed JARs in vespa-3party-jars. Add bundle-plugin goal
wrapping maven-shade-plugin's DefaultShader that excludes installed JARs
and lists them in manifest's Class-Path instead.
---
 zookeeper-command-line-client/pom.xml | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

(limited to 'zookeeper-command-line-client/pom.xml')

diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml
index ae3f5b3bfa1..7bbbf33a62f 100644
--- a/zookeeper-command-line-client/pom.xml
+++ b/zookeeper-command-line-client/pom.xml
@@ -63,27 +63,22 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <configuration><skip>true</skip></configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.yahoo.vespa</groupId>
+        <artifactId>bundle-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals><goal>assemble-fat-jar</goal></goals>
+          </execution>
+        </executions>
         <configuration>
-           <archive>
-             <manifest>
-               <mainClass>com.yahoo.vespa.zookeeper.cli.Main</mainClass>
-             </manifest>
-           </archive>
-           <descriptorRefs>
-             <descriptorRef>jar-with-dependencies</descriptorRef>
-           </descriptorRefs>
-         </configuration>
-         <executions>
-           <execution>
-             <id>make-assembly</id>
-             <phase>package</phase>
-             <!-- append to the packaging phase. -->
-             <goals>
-               <goal>single</goal>
-             </goals>
-           </execution>
-         </executions>
+          <mainClass>com.yahoo.vespa.zookeeper.cli.Main</mainClass>
+        </configuration>
       </plugin>
     </plugins>
   </build>
-- 
cgit v1.2.3