Merge pull request #3884 from Agnul97/fix-liquibaseFksDependencies

FIX - Foreign keys liquibase scripts correctly imported and executed
eclipse · Oct 30, 2023 · 30c0262 · 30c0262
2 parents e1a0e7d + f600bbb
commit 30c0262
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 15 deletions.
diff --git a/assembly/api/descriptors/kapua-api-jetty.xml b/assembly/api/descriptors/kapua-api-jetty.xml
@@ -34,7 +34,6 @@
 
             <includes>
                 <include>${pom.groupId}:kapua-rest-api-web:war</include>
-                <include>${pom.groupId}:kapua-foreignkeys</include>
             </includes>
 
         </dependencySet>

diff --git a/assembly/api/pom.xml b/assembly/api/pom.xml
@@ -140,10 +140,6 @@
             <artifactId>kapua-transport-mqtt</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-foreignkeys</artifactId>
-        </dependency>
         <dependency>
             <!-- Google protobuf for message encoding -->
             <groupId>com.google.protobuf</groupId>

diff --git a/assembly/console/descriptors/kapua-console-jetty.xml b/assembly/console/descriptors/kapua-console-jetty.xml
@@ -42,7 +42,6 @@
 
             <includes>
                 <include>${pom.groupId}:kapua-console-web:war</include>
-                <include>${pom.groupId}:kapua-foreignkeys</include>
             </includes>
 
         </dependencySet>

diff --git a/assembly/console/pom.xml b/assembly/console/pom.xml
@@ -133,10 +133,6 @@
             <artifactId>kapua-transport-mqtt</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-foreignkeys</artifactId>
-        </dependency>
         <dependency>
             <!-- Google protobuf for message encoding -->
             <groupId>com.google.protobuf</groupId>

diff --git a/assembly/job-engine/descriptors/kapua-job-engine-jetty.xml b/assembly/job-engine/descriptors/kapua-job-engine-jetty.xml
@@ -34,7 +34,6 @@
 
             <includes>
                 <include>${pom.groupId}:kapua-job-engine-app-web:war</include>
-                <include>${pom.groupId}:kapua-foreignkeys</include>
             </includes>
 
         </dependencySet>

diff --git a/assembly/job-engine/pom.xml b/assembly/job-engine/pom.xml
@@ -31,10 +31,6 @@
             <artifactId>kapua-assembly-java-base</artifactId>
             <type>pom</type>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.kapua</groupId>
-            <artifactId>kapua-foreignkeys</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-job-engine-app-web</artifactId>

diff --git a/job-engine/app/web/pom.xml b/job-engine/app/web/pom.xml
@@ -222,6 +222,10 @@
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-endpoint-internal</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.kapua</groupId>
+            <artifactId>kapua-foreignkeys</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-web</artifactId>

diff --git a/rest-api/web/pom.xml b/rest-api/web/pom.xml
@@ -164,6 +164,10 @@
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-user-internal</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.kapua</groupId>
+            <artifactId>kapua-foreignkeys</artifactId>
+        </dependency>
 
         <!-- Jersey -->
         <dependency>