From 8c28e6405cef50991d57595e56c22e346bc5ffe3 Mon Sep 17 00:00:00 2001
From: Rene Peinthor <rene.peinthor@linbit.com>
Date: Mon, 9 Oct 2023 13:34:57 +0200
Subject: [PATCH] linstor: don't merge java-linstor into client jar

This makes it easier to apply patches, if the linstor library needs to
be updated outside of cloudstack releases.
---
 client/pom.xml                  | 6 ++++++
 plugins/hypervisors/kvm/pom.xml | 5 -----
 pom.xml                         | 5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 8ff1fea9adb9..ea16352274e7 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -822,6 +822,12 @@
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${project.build.directory}/lib</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.linbit.linstor.api</groupId>
+                                    <artifactId>java-linstor</artifactId>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
                                     <artifactId>bctls-jdk15on</artifactId>
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index 9265d66c79ad..86b3a1bf7606 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -62,11 +62,6 @@
             <artifactId>rados</artifactId>
             <version>${cs.rados-java.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.linbit.linstor.api</groupId>
-            <artifactId>java-linstor</artifactId>
-            <version>${cs.java-linstor.version}</version>
-        </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
diff --git a/pom.xml b/pom.xml
index d595723a9ffd..20ff4f9e299b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -699,6 +699,11 @@
                 <artifactId>xml-apis</artifactId>
                 <version>2.0.2</version>
             </dependency>
+            <dependency>
+                <groupId>com.linbit.linstor.api</groupId>
+                <artifactId>java-linstor</artifactId>
+                <version>${cs.java-linstor.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>