From 79fa8321efbeeebf0c10d9678c46bb2082d8dd4b Mon Sep 17 00:00:00 2001
From: Cristiano Nicolai <570894+cristianonicolai@users.noreply.github.com>
Date: Fri, 23 Jun 2023 11:35:34 +1000
Subject: [PATCH] KOGITO-9416 - Include kogito-ddl in prod profile (#1789)

---
 persistence-commons/kogito-ddl/pom.xml        | 101 ++++++++++--------
 .../src/assembly/multi-repo-zip.xml           |   2 +-
 .../assembly/productized-multi-repo-zip.xml   |  35 ++++++
 persistence-commons/pom.xml                   |   2 +-
 4 files changed, 96 insertions(+), 44 deletions(-)
 create mode 100644 persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml

diff --git a/persistence-commons/kogito-ddl/pom.xml b/persistence-commons/kogito-ddl/pom.xml
index 158cea7d16..17cb63cc6f 100644
--- a/persistence-commons/kogito-ddl/pom.xml
+++ b/persistence-commons/kogito-ddl/pom.xml
@@ -3,48 +3,65 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>persistence-commons</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>kogito-ddl</artifactId>
-    <name>Kogito Apps :: DB Scripts Collection Multi Repo</name>
-    <packaging>pom</packaging>
+  <parent>
+    <groupId>org.kie.kogito</groupId>
+    <artifactId>persistence-commons</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>kogito-ddl</artifactId>
+  <name>Kogito Apps :: DB Scripts Collection Multi Repo</name>
+  <packaging>pom</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-ddl-runtimes</artifactId>
-            <version>${project.version}</version>
-            <classifier>db-scripts</classifier>
-            <type>zip</type>
-         </dependency>
-    </dependencies>
+  <properties>
+    <db.scripts.descriptor>src/assembly/multi-repo-zip.xml</db.scripts.descriptor>
+  </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/assembly/multi-repo-zip.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>db-scripts-collection</id>
-                        <inherited>false</inherited>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-ddl-runtimes</artifactId>
+      <version>${project.version}</version>
+      <classifier>db-scripts</classifier>
+      <type>zip</type>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <inherited>false</inherited>
+        <configuration>
+          <descriptors>
+            <descriptor>${db.scripts.descriptor}</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>db-scripts-collection</id>
+            <inherited>false</inherited>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>productized</id>
+      <activation>
+        <property>
+          <name>productized</name>
+        </property>
+      </activation>
+      <properties>
+        <db.scripts.descriptor>src/assembly/productized-multi-repo-zip.xml</db.scripts.descriptor>
+      </properties>
+    </profile>
+  </profiles>
 </project>
\ No newline at end of file
diff --git a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml
index 4fe2a2b75b..6d87cc723a 100644
--- a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml
+++ b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml
@@ -32,7 +32,7 @@
         </fileSet>
         <!-- Job Service DDLs - Flyway scripts -->
         <fileSet>
-            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql/src/main/resources/db/jobs-service</directory>
+            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service</directory>
             <outputDirectory>postgresql/jobs-service</outputDirectory>
             <includes>
                 <include>*.sql</include>
diff --git a/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml
new file mode 100644
index 0000000000..68cf514b1b
--- /dev/null
+++ b/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml
@@ -0,0 +1,35 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <id>db-scripts</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <unpack>true</unpack>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>org.kie.kogito:kogito-ddl-runtimes:zip:db-scripts</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration</directory>
+            <outputDirectory>postgresql/data-index</outputDirectory>
+            <includes>
+                <include>*.sql</include>
+            </includes>
+        </fileSet>
+        <!-- Job Service DDLs - Flyway scripts -->
+        <fileSet>
+            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service</directory>
+            <outputDirectory>postgresql/jobs-service</outputDirectory>
+            <includes>
+                <include>*.sql</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/persistence-commons/pom.xml b/persistence-commons/pom.xml
index 2b1591912c..ccf7b4e356 100644
--- a/persistence-commons/pom.xml
+++ b/persistence-commons/pom.xml
@@ -18,6 +18,7 @@
     <module>persistence-commons-api</module>
     <module>persistence-commons-protobuf</module>
     <module>persistence-commons-postgresql</module>
+    <module>kogito-ddl</module>
   </modules>
 
   <profiles>
@@ -34,7 +35,6 @@
         <module>persistence-commons-redis</module>
         <module>persistence-commons-oracle</module>
         <module>persistence-commons-reporting-parent</module>
-        <module>kogito-ddl</module>
       </modules>
     </profile>
   </profiles>