From ed6f9ade941af02d9bee6664f5e11e476c9ce3d3 Mon Sep 17 00:00:00 2001
From: Gabriele-Cardosi <gabriele.cardosi@ibm.com>
Date: Thu, 31 Oct 2024 11:45:26 +0100
Subject: [PATCH] [incubator-kie-issues#1460] Adapted tests

---
 .../cloudevents-spring-boot-addon-it-invoked/pom.xml | 12 +++++++++---
 .../src/main/resources/archetype-resources/pom.xml   |  9 ++++++++-
 springboot/bom/pom.xml                               |  9 ++++++++-
 .../pom.xml                                          | 10 +---------
 .../integration-tests-springboot-kafka-it/pom.xml    | 10 +---------
 .../integration-tests-springboot-norest-it/pom.xml   | 10 +---------
 .../pom.xml                                          | 10 +---------
 .../pom.xml                                          | 10 +---------
 .../pom.xml                                          | 10 +---------
 .../pom.xml                                          | 10 +---------
 .../pom.xml                                          | 10 +---------
 .../pom.xml                                          | 10 +---------
 .../pom.xml                                          | 10 +---------
 13 files changed, 35 insertions(+), 95 deletions(-)

diff --git a/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/pom.xml b/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/pom.xml
index 441ae79acdc..76fe0824346 100644
--- a/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/pom.xml
+++ b/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/pom.xml
@@ -86,9 +86,15 @@
       <plugin>
         <groupId>org.kie.kogito</groupId>
         <artifactId>kogito-maven-plugin</artifactId>
-        <version>${project.version}
-        </version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
-        <extensions>true</extensions>
+        <version>${project.version}</version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>generateModel</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.springframework.boot</groupId>
diff --git a/springboot/archetype/src/main/resources/archetype-resources/pom.xml b/springboot/archetype/src/main/resources/archetype-resources/pom.xml
index 21f342ef793..06fee90d8a9 100644
--- a/springboot/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/springboot/archetype/src/main/resources/archetype-resources/pom.xml
@@ -89,7 +89,14 @@
         <groupId>org.kie.kogito</groupId>
         <artifactId>kogito-maven-plugin</artifactId>
         <version>${kogito.version}</version>
-        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>generateModel</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.springframework.boot</groupId>
diff --git a/springboot/bom/pom.xml b/springboot/bom/pom.xml
index f314e002ea7..72209c0054b 100644
--- a/springboot/bom/pom.xml
+++ b/springboot/bom/pom.xml
@@ -107,7 +107,14 @@
           <groupId>org.kie.kogito</groupId>
           <artifactId>kogito-maven-plugin</artifactId>
           <version>${project.version}</version>
-          <extensions>true</extensions>
+          <executions>
+            <execution>
+              <phase>compile</phase>
+              <goals>
+                <goal>generateModel</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/springboot/integration-tests/integration-tests-springboot-decisions-it/pom.xml b/springboot/integration-tests/integration-tests-springboot-decisions-it/pom.xml
index 844e657acd3..22c7f4d38ac 100644
--- a/springboot/integration-tests/integration-tests-springboot-decisions-it/pom.xml
+++ b/springboot/integration-tests/integration-tests-springboot-decisions-it/pom.xml
@@ -140,19 +140,11 @@
           <version>${project.version}</version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
           <executions>
             <execution>
-              <id>kogito-generate-model</id>
-              <phase>process-resources</phase> <!-- Temporary hack -->
+              <phase>compile</phase>
               <goals>
                 <goal>generateModel</goal>
               </goals>
             </execution>
-            <execution>
-              <id>kogito-process-model-classes</id>
-              <phase>process-classes</phase> <!-- Temporary hack -->
-              <goals>
-                <goal>process-model-classes</goal>
-              </goals>
-            </execution>
           </executions>
         </plugin>
         <plugin>
diff --git a/springboot/integration-tests/integration-tests-springboot-kafka-it/pom.xml b/springboot/integration-tests/integration-tests-springboot-kafka-it/pom.xml
index b40463110b7..5940bf10dbd 100644
--- a/springboot/integration-tests/integration-tests-springboot-kafka-it/pom.xml
+++ b/springboot/integration-tests/integration-tests-springboot-kafka-it/pom.xml
@@ -134,19 +134,11 @@
         <version>${project.version}</version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
         <executions>
           <execution>
-            <id>kogito-generate-model</id>
-            <phase>process-resources</phase> <!-- Temporary hack -->
+            <phase>compile</phase>
             <goals>
               <goal>generateModel</goal>
             </goals>
           </execution>
-          <execution>
-            <id>kogito-process-model-classes</id>
-            <phase>process-classes</phase> <!-- Temporary hack -->
-            <goals>
-              <goal>process-model-classes</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/springboot/integration-tests/integration-tests-springboot-norest-it/pom.xml b/springboot/integration-tests/integration-tests-springboot-norest-it/pom.xml
index eaa58d571bf..4bb9dc49461 100644
--- a/springboot/integration-tests/integration-tests-springboot-norest-it/pom.xml
+++ b/springboot/integration-tests/integration-tests-springboot-norest-it/pom.xml
@@ -130,19 +130,11 @@
         <version>${project.version}</version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
         <executions>
           <execution>
-            <id>kogito-generate-model</id>
-            <phase>process-resources</phase>
+            <phase>compile</phase>
             <goals>
               <goal>generateModel</goal>
             </goals>
           </execution>
-          <execution>
-            <id>kogito-process-model-classes</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>process-model-classes</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml b/springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
index 66bd8d48053..4a5d5c1e4d2 100644
--- a/springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
+++ b/springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
@@ -160,19 +160,11 @@
         <version>${project.version}</version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
         <executions>
           <execution>
-            <id>kogito-generate-model</id>
-            <phase>process-resources</phase>
+            <phase>compile</phase>
             <goals>
               <goal>generateModel</goal>
             </goals>
           </execution>
-          <execution>
-            <id>kogito-process-model-classes</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>process-model-classes</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-filesystem/pom.xml b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-filesystem/pom.xml
index 1552f63af67..e5449fc892e 100644
--- a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-filesystem/pom.xml
+++ b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-filesystem/pom.xml
@@ -127,19 +127,11 @@
         <version>${project.version}</version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
         <executions>
           <execution>
-            <id>kogito-generate-model</id>
-            <phase>process-resources</phase> <!-- Temporary hack -->
+            <phase>compile</phase>
             <goals>
               <goal>generateModel</goal>
             </goals>
           </execution>
-          <execution>
-            <id>kogito-process-model-classes</id>
-            <phase>process-classes</phase> <!-- Temporary hack -->
-            <goals>
-              <goal>process-model-classes</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
index 81108b3bfbd..10216288678 100644
--- a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
+++ b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
@@ -152,19 +152,11 @@
         <version>${project.version}</version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
         <executions>
           <execution>
-            <id>kogito-generate-model</id>
-            <phase>process-resources</phase> <!-- Temporary hack -->
+            <phase>compile</phase>
             <goals>
               <goal>generateModel</goal>
             </goals>
           </execution>
-          <execution>
-            <id>kogito-process-model-classes</id>
-            <phase>process-classes</phase> <!-- Temporary hack -->
-            <goals>
-              <goal>process-model-classes</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-jdbc/pom.xml b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-jdbc/pom.xml
index f967b626380..85604a3f016 100644
--- a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-jdbc/pom.xml
+++ b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-jdbc/pom.xml
@@ -144,19 +144,11 @@
         <version>${project.version}</version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
         <executions>
           <execution>
-            <id>kogito-generate-model</id>
-            <phase>process-resources</phase> <!-- Temporary hack -->
+            <phase>compile</phase>
             <goals>
               <goal>generateModel</goal>
             </goals>
           </execution>
-          <execution>
-            <id>kogito-process-model-classes</id>
-            <phase>process-classes</phase> <!-- Temporary hack -->
-            <goals>
-              <goal>process-model-classes</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-mongodb/pom.xml b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-mongodb/pom.xml
index 07a2eec267d..520e1e2c986 100644
--- a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-mongodb/pom.xml
+++ b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-mongodb/pom.xml
@@ -136,19 +136,11 @@
         <version>${project.version}</version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
         <executions>
           <execution>
-            <id>kogito-generate-model</id>
-            <phase>process-resources</phase> <!-- Temporary hack -->
+            <phase>compile</phase>
             <goals>
               <goal>generateModel</goal>
             </goals>
           </execution>
-          <execution>
-            <id>kogito-process-model-classes</id>
-            <phase>process-classes</phase> <!-- Temporary hack -->
-            <goals>
-              <goal>process-model-classes</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-postgresql/pom.xml b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-postgresql/pom.xml
index 7ed90b3c37e..9ff466ba7ca 100644
--- a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-postgresql/pom.xml
+++ b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-postgresql/pom.xml
@@ -141,19 +141,11 @@
         <version>${project.version}</version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
         <executions>
           <execution>
-            <id>kogito-generate-model</id>
-            <phase>process-resources</phase> <!-- Temporary hack -->
+            <phase>compile</phase>
             <goals>
               <goal>generateModel</goal>
             </goals>
           </execution>
-          <execution>
-            <id>kogito-process-model-classes</id>
-            <phase>process-classes</phase> <!-- Temporary hack -->
-            <goals>
-              <goal>process-model-classes</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/springboot/integration-tests/integration-tests-springboot-usertasks-it/pom.xml b/springboot/integration-tests/integration-tests-springboot-usertasks-it/pom.xml
index d3a7645e5f9..c9eadd17d81 100644
--- a/springboot/integration-tests/integration-tests-springboot-usertasks-it/pom.xml
+++ b/springboot/integration-tests/integration-tests-springboot-usertasks-it/pom.xml
@@ -133,19 +133,11 @@
                 <version>${project.version}</version> <!-- Needed, otherwise it would use the latest release found on Maven central -->
                 <executions>
                     <execution>
-                        <id>kogito-generate-model</id>
-                        <phase>process-resources</phase> <!-- Temporary hack -->
+                        <phase>compile</phase>
                         <goals>
                             <goal>generateModel</goal>
                         </goals>
                     </execution>
-                    <execution>
-                        <id>kogito-process-model-classes</id>
-                        <phase>process-classes</phase> <!-- Temporary hack -->
-                        <goals>
-                            <goal>process-model-classes</goal>
-                        </goals>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>