Squashed commit of the following:

commit d7aa910 Author: Jan Stastny <[email protected]> Date: Tue Apr 6 09:18:13 2021 +0200 add kogito-quarkus-bom in integration-tests-springboot commit 9d511dc Author: Jan Stastny <[email protected]> Date: Thu Apr 1 19:02:49 2021 +0200 disable snapshots in jenkinsfile commit 4062428 Author: Jan Stastny <[email protected]> Date: Thu Apr 1 19:01:10 2021 +0200 add missing explicit test dependencies commit d052ee5 Author: Jan Stastny <[email protected]> Date: Thu Apr 1 19:00:24 2021 +0200 Fix failures when no user settings file available commit 34b4e7b Author: Jan Stastny <[email protected]> Date: Wed Mar 31 19:24:57 2021 +0200 KOGITO-4847 Fix local builds for integration tests
apache · Apr 7, 2021 · 4c5125c · 4c5125c
1 parent eba8af5
commit 4c5125c
Show file tree

Hide file tree

Showing 25 changed files with 233 additions and 39 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -249,6 +249,7 @@ void checkoutOptaplannerRepo() {
 MavenCommand getMavenCommand(String directory, boolean addQuarkusVersion=true, boolean canNative = false) {
     mvnCmd = new MavenCommand(this, ['-fae'])
                 .withSettingsXmlId('kogito_release_settings')
+                .withSnapshotsDisabledInSettings()
                 // add timestamp to Maven logs
                 .withOptions(['-Dorg.slf4j.simpleLogger.showDateTime=true', '-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS'])
                 .inDirectory(directory)

diff --git a/addons/cloudevents/cloudevents-spring-boot-addon-it/pom.xml b/addons/cloudevents/cloudevents-spring-boot-addon-it/pom.xml
@@ -25,6 +25,23 @@
       <artifactId>kogito-maven-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-bom</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-springboot-starter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-cloudevents-spring-boot-addon</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -33,9 +50,6 @@
             <artifactId>maven-invoker-plugin</artifactId>
             <configuration>
                 <streamLogs>true</streamLogs>
-                <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-                <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-                <useLocalRepository>true</useLocalRepository>
                 <postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
             </configuration>
             <executions>

diff --git a/addons/explainability-addon/explainability-quarkus-addon/pom.xml b/addons/explainability-addon/explainability-quarkus-addon/pom.xml
@@ -82,9 +82,9 @@
                     <excludes>
                         <exclude>**/Native*IT.java</exclude>
                     </excludes>
-                    <systemProperties>
+                    <systemPropertyVariables combine.children="append">
                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                    </systemProperties>
+                    </systemPropertyVariables>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/addons/persistence/infinispan-quarkus-health-addon/pom.xml b/addons/persistence/infinispan-quarkus-health-addon/pom.xml
@@ -96,7 +96,7 @@
               <goal>verify</goal>
             </goals>
             <configuration>
-              <systemPropertyVariables>
+              <systemPropertyVariables combine.children="append">
                 <container.image.infinispan>${container.image.infinispan}</container.image.infinispan>
               </systemPropertyVariables>
             </configuration>

diff --git a/addons/task-management/task-management-quarkus-addon/pom.xml b/addons/task-management/task-management-quarkus-addon/pom.xml
@@ -95,7 +95,7 @@
           <includes>
             <include>org/kie/kogito/task/management/test/*</include>
           </includes>
-          <systemPropertyVariables>
+          <systemPropertyVariables combine.children="append">
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
             <container.image.infinispan>${container.image.infinispan}</container.image.infinispan>
           </systemPropertyVariables>

diff --git a/archetypes/kogito-quarkus-archetype/pom.xml b/archetypes/kogito-quarkus-archetype/pom.xml
@@ -30,6 +30,18 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-quarkus-bom</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-quarkus</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/archetypes/kogito-quarkus-dm-archetype/pom.xml b/archetypes/kogito-quarkus-dm-archetype/pom.xml
@@ -30,6 +30,28 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-quarkus-bom</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-quarkus-rules</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-quarkus-decisions</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-quarkus-predictions</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/archetypes/kogito-springboot-archetype/pom.xml b/archetypes/kogito-springboot-archetype/pom.xml
@@ -20,6 +20,12 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-springboot-starter</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/archetypes/kogito-springboot-dm-archetype/pom.xml b/archetypes/kogito-springboot-dm-archetype/pom.xml
@@ -20,6 +20,12 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-springboot-starter</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -15,11 +15,26 @@
     <maven.compiler.release>11</maven.compiler.release> 
   </properties>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-archetype-plugin</artifactId>
+          <configuration>
+            <localRepositoryPath>${session.request.localRepositoryPath.path}</localRepositoryPath>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
   <profiles>
     <profile>
       <id>default</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>!productized</name>
+        </property>
       </activation>
       <modules>
         <module>kogito-springboot-archetype</module>
@@ -38,6 +53,29 @@
         <module>kogito-quarkus-dm-archetype</module>
       </modules>
     </profile>
+    <profile>
+      <!--
+        This profile serves at optionally passing settingsFile property to archetype::integration-test goal.
+        Reason is that the ${session.request.userSettingsFile.path} property defaults to ~/.m2/settings.xml even
+        if that file does not actually exist. Tests were in such case failing.
+      -->
+      <id>set-settings-when-provided</id>
+      <activation>
+        <file><exists>${session.request.userSettingsFile.path}</exists></file>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <artifactId>maven-archetype-plugin</artifactId>
+              <configuration>
+                <settingsFile>${session.request.userSettingsFile.path}</settingsFile>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
   </profiles>
 
 </project>
diff --git a/integration-tests/integration-tests-kogito-plugin/pom.xml b/integration-tests/integration-tests-kogito-plugin/pom.xml
@@ -20,6 +20,26 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-bom</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-quarkus-bom</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>process-management-addon</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -28,9 +48,6 @@
         <artifactId>maven-invoker-plugin</artifactId>
         <configuration>
           <streamLogs>true</streamLogs>
-          <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-          <useLocalRepository>true</useLocalRepository>
           <postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
           <properties>
             <version.io.quarkus>${version.io.quarkus}</version.io.quarkus>

diff --git a/...n-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/pom.xml b/...n-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/pom.xml
@@ -98,13 +98,13 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>@version.surefire.plugin@</version>
                 <configuration>
-                    <systemProperties>
+                    <systemPropertyVariables>
                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                         <!-- quarkus plugin and being run by invoker, need to pass explicitly -->
                         <maven.repo.local>${session.request.localRepositoryPath.path}</maven.repo.local>
                         <maven.settings>${session.request.userSettingsFile.path}</maven.settings>
-                    </systemProperties>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/integration-tests/integration-tests-quarkus-decisions/pom.xml b/integration-tests/integration-tests-quarkus-decisions/pom.xml
@@ -166,10 +166,10 @@
                   <goal>verify</goal>
                 </goals>
                 <configuration>
-                  <systemProperties>
+                  <systemPropertyVariables combine.children="append">
                     <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                     <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                  </systemProperties>
+                  </systemPropertyVariables>
                 </configuration>
               </execution>
             </executions>

diff --git a/integration-tests/integration-tests-quarkus-predictions/pom.xml b/integration-tests/integration-tests-quarkus-predictions/pom.xml
@@ -128,7 +128,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <systemPropertyVariables>
+          <systemPropertyVariables combine.children="append">
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
             <container.image.infinispan>${container.image.infinispan}</container.image.infinispan>
           </systemPropertyVariables>
@@ -160,9 +160,9 @@
                   <goal>verify</goal>
                 </goals>
                 <configuration>
-                  <systemProperties>
+                  <systemPropertyVariables combine.children="append">
                     <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                  </systemProperties>
+                  </systemPropertyVariables>
                 </configuration>
               </execution>
             </executions>

diff --git a/integration-tests/integration-tests-quarkus-processes/pom.xml b/integration-tests/integration-tests-quarkus-processes/pom.xml
@@ -168,7 +168,7 @@
           <includes>
             <include>org/kie/kogito/integrationtests/quarkus/*</include>
           </includes>
-          <systemPropertyVariables>
+          <systemPropertyVariables combine.children="append">
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
             <container.image.infinispan>${container.image.infinispan}</container.image.infinispan>
             <container.image.kafka>${container.image.kafka}</container.image.kafka>
@@ -206,7 +206,7 @@
                 <include>org/kie/kogito/integrationtests/quarkus/*</include>
                 <include>org/kie/kogito/integrationtests/quarkus/infinispan/*</include>
               </includes>
-              <systemPropertyVariables>
+              <systemPropertyVariables combine.children="append">
                 <enable.resource.infinispan>true</enable.resource.infinispan>
               </systemPropertyVariables>
             </configuration>
@@ -242,9 +242,9 @@
                   <goal>verify</goal>
                 </goals>
                 <configuration>
-                  <systemProperties>
+                  <systemPropertyVariables combine.children="append">
                     <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                  </systemProperties>
+                  </systemPropertyVariables>
                 </configuration>
               </execution>
             </executions>

diff --git a/integration-tests/integration-tests-quarkus-rules/pom.xml b/integration-tests/integration-tests-quarkus-rules/pom.xml
@@ -132,7 +132,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <systemPropertyVariables>
+          <systemPropertyVariables combine.children="append">
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
             <container.image.infinispan>${container.image.infinispan}</container.image.infinispan>
           </systemPropertyVariables>
@@ -164,9 +164,9 @@
                   <goal>verify</goal>
                 </goals>
                 <configuration>
-                  <systemProperties>
+                  <systemPropertyVariables combine.children="append">
                     <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                  </systemProperties>
+                  </systemPropertyVariables>
                 </configuration>
               </execution>
             </executions>

diff --git a/integration-tests/integration-tests-springboot/pom.xml b/integration-tests/integration-tests-springboot/pom.xml
@@ -34,7 +34,40 @@
        <scope>test</scope>
     </dependency>
 
-
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-bom</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-quarkus-bom</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-cloudevents-spring-boot-addon</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-test-utils</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>process-management-springboot-addon</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>task-management-springboot-addon</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-spring-boot-starter-remote</artifactId>
@@ -92,9 +125,6 @@
           <artifactId>maven-invoker-plugin</artifactId>
           <configuration>
             <streamLogs>true</streamLogs>
-            <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-            <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-            <useLocalRepository>true</useLocalRepository>
             <postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
             <properties>
               <container.image.infinispan>${container.image.infinispan}</container.image.infinispan>