This is an automated email from the ASF dual-hosted git repository.
gitgabrio pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/main by this push:
new 5d04d8b417 [incubator-kie-issues#1462] Refactoring springboot
integration tests configuration to avoid usage of extensions flag (#3656)
5d04d8b417 is described below
commit 5d04d8b41767c5ea9362c322df633bbc8ea9be0c
Author: Gabriele Cardosi <[email protected]>
AuthorDate: Tue Sep 3 15:52:14 2024 +0200
[incubator-kie-issues#1462] Refactoring springboot integration tests
configuration to avoid usage of extensions flag (#3656)
* [incubator-kie-issues#1462] Refactoring springboot integration tests
configuration to avoid usage of extensions flag
* [incubator-kie-issues#1462] Avoid duplicated declarationof same plugin
---------
Co-authored-by: Gabriele-Cardosi <[email protected]>
---
.../pom.xml | 26 ++++++++++-
.../integration-tests-springboot-kafka-it/pom.xml | 26 ++++++++++-
.../integration-tests-springboot-norest-it/pom.xml | 26 ++++++++++-
.../pom.xml | 26 ++++++++++-
.../pom.xml | 51 ++++++++++++----------
.../pom.xml | 51 ++++++++++++----------
.../pom.xml | 51 ++++++++++++----------
.../pom.xml | 51 ++++++++++++----------
.../pom.xml | 51 ++++++++++++----------
.../pom.xml | 33 +++++++++-----
10 files changed, 268 insertions(+), 124 deletions(-)
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 8dcda368af..9f08b2b835 100644
---
a/springboot/integration-tests/integration-tests-springboot-decisions-it/pom.xml
+++
b/springboot/integration-tests/integration-tests-springboot-decisions-it/pom.xml
@@ -124,12 +124,36 @@
<configuration>
<release>${maven.compiler.release}</release>
</configuration>
+ <executions>
+ <execution>
+ <id>pre-kogito-generate-model</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<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>
+ <executions>
+ <execution>
+ <id>kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
+ <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>
<groupId>org.springframework.boot</groupId>
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 96a8a6ef2e..690239a124 100644
--- a/springboot/integration-tests/integration-tests-springboot-kafka-it/pom.xml
+++ b/springboot/integration-tests/integration-tests-springboot-kafka-it/pom.xml
@@ -118,12 +118,36 @@
<configuration>
<release>${maven.compiler.release}</release>
</configuration>
+ <executions>
+ <execution>
+ <id>pre-kogito-generate-model</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<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>
+ <executions>
+ <execution>
+ <id>kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
+ <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>
<groupId>org.springframework.boot</groupId>
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 c3136d58f3..cb2a4795be 100644
---
a/springboot/integration-tests/integration-tests-springboot-norest-it/pom.xml
+++
b/springboot/integration-tests/integration-tests-springboot-norest-it/pom.xml
@@ -114,12 +114,36 @@
<configuration>
<release>${maven.compiler.release}</release>
</configuration>
+ <executions>
+ <execution>
+ <id>pre-kogito-generate-model</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<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>
+ <executions>
+ <execution>
+ <id>kogito-generate-model</id>
+ <phase>process-resources</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>
<groupId>org.springframework.boot</groupId>
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 1371c640bc..e5f9ff3402 100644
---
a/springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
+++
b/springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
@@ -144,12 +144,36 @@
<configuration>
<release>${maven.compiler.release}</release>
</configuration>
+ <executions>
+ <execution>
+ <id>pre-kogito-generate-model</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<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>
+ <executions>
+ <execution>
+ <id>kogito-generate-model</id>
+ <phase>process-resources</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>
<groupId>org.springframework.boot</groupId>
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 1e9c9cd5df..1552f63af6 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
@@ -86,7 +86,6 @@
</dependencies>
<build>
- <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -103,39 +102,47 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${version.resources.plugin}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.compiler.plugin}</version>
+ <configuration>
+ <release>${maven.compiler.release}</release>
+ </configuration>
<executions>
<execution>
- <phase>generate-resources</phase>
+ <id>pre-kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
<goals>
- <goal>copy-resources</goal>
+ <goal>compile</goal>
</goals>
- <configuration>
-
<outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
- <resources>
- <resource>
-
<directory>${project.parent.basedir}/integration-tests-springboot-processes-persistence-common/src/main/resources</directory>
- <includes>
- <include>**/*.bpmn</include>
- <include>**/*.wid</include>
- </includes>
- </resource>
- </resources>
- </configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
<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>
+ <executions>
+ <execution>
+ <id>kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
+ <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>
</build>
+
</project>
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 0339cbf99a..81108b3bfb 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
@@ -111,7 +111,6 @@
</dependencies>
<build>
- <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -128,39 +127,47 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${version.resources.plugin}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.compiler.plugin}</version>
+ <configuration>
+ <release>${maven.compiler.release}</release>
+ </configuration>
<executions>
<execution>
- <phase>generate-resources</phase>
+ <id>pre-kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
<goals>
- <goal>copy-resources</goal>
+ <goal>compile</goal>
</goals>
- <configuration>
-
<outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
- <resources>
- <resource>
-
<directory>${project.parent.basedir}/integration-tests-springboot-processes-persistence-common/src/main/resources</directory>
- <includes>
- <include>**/*.bpmn</include>
- <include>**/*.wid</include>
- </includes>
- </resource>
- </resources>
- </configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
<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>
+ <executions>
+ <execution>
+ <id>kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
+ <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>
</build>
+
</project>
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 230c010b4b..d897aac69d 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
@@ -99,7 +99,6 @@
</dependencies>
<build>
- <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -116,39 +115,47 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${version.resources.plugin}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.compiler.plugin}</version>
+ <configuration>
+ <release>${maven.compiler.release}</release>
+ </configuration>
<executions>
<execution>
- <phase>generate-resources</phase>
+ <id>pre-kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
<goals>
- <goal>copy-resources</goal>
+ <goal>compile</goal>
</goals>
- <configuration>
-
<outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
- <resources>
- <resource>
-
<directory>${project.parent.basedir}/integration-tests-springboot-processes-persistence-common/src/main/resources</directory>
- <includes>
- <include>**/*.bpmn</include>
- <include>**/*.wid</include>
- </includes>
- </resource>
- </resources>
- </configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
<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>
+ <executions>
+ <execution>
+ <id>kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
+ <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>
</build>
+
</project>
\ No newline at end of file
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 56437bbfd9..07a2eec267 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
@@ -95,7 +95,6 @@
</dependencies>
<build>
- <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -112,39 +111,47 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${version.resources.plugin}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.compiler.plugin}</version>
+ <configuration>
+ <release>${maven.compiler.release}</release>
+ </configuration>
<executions>
<execution>
- <phase>generate-resources</phase>
+ <id>pre-kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
<goals>
- <goal>copy-resources</goal>
+ <goal>compile</goal>
</goals>
- <configuration>
-
<outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
- <resources>
- <resource>
-
<directory>${project.parent.basedir}/integration-tests-springboot-processes-persistence-common/src/main/resources</directory>
- <includes>
- <include>**/*.bpmn</include>
- <include>**/*.wid</include>
- </includes>
- </resource>
- </resources>
- </configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
<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>
+ <executions>
+ <execution>
+ <id>kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
+ <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>
</build>
+
</project>
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 aa161e79cd..7ed90b3c37 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
@@ -100,7 +100,6 @@
</dependencies>
<build>
- <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -117,39 +116,47 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${version.resources.plugin}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.compiler.plugin}</version>
+ <configuration>
+ <release>${maven.compiler.release}</release>
+ </configuration>
<executions>
<execution>
- <phase>generate-resources</phase>
+ <id>pre-kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
<goals>
- <goal>copy-resources</goal>
+ <goal>compile</goal>
</goals>
- <configuration>
-
<outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
- <resources>
- <resource>
-
<directory>${project.parent.basedir}/integration-tests-springboot-processes-persistence-common/src/main/resources</directory>
- <includes>
- <include>**/*.bpmn</include>
- <include>**/*.wid</include>
- </includes>
- </resource>
- </resources>
- </configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
<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>
+ <executions>
+ <execution>
+ <id>kogito-generate-model</id>
+ <phase>process-resources</phase> <!-- Temporary hack -->
+ <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>
</build>
+
</project>
diff --git
a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/pom.xml
b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/pom.xml
index 48e62747fb..2892a76ee4 100644
---
a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/pom.xml
+++
b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/pom.xml
@@ -115,6 +115,7 @@
</dependency>
</dependencies>
<build>
+ <finalName>${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<plugin>
@@ -129,12 +130,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.kie.kogito</groupId>
- <artifactId>kogito-maven-plugin</artifactId>
- <version>${project.version}</version>
- <extensions>true</extensions>
- </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
@@ -182,10 +177,28 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <!-- override Infinispan BOM -->
- <version>${version.compiler.plugin}</version>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${version.resources.plugin}</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${project.parent.basedir}/integration-tests-springboot-processes-persistence-common/src/main/resources</directory>
+ <includes>
+ <include>**/*.bpmn</include>
+ <include>**/*.wid</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
