Merge remote-tracking branch 'origin/main' into incubator-kie-issues#…

…1460
apache · Nov 28, 2024 · 990f1ed · 990f1ed
2 parents 21b3db4 + a829621
commit 990f1ed
Show file tree

Hide file tree

Showing 70 changed files with 875 additions and 337 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
@@ -119,7 +119,9 @@ pipeline {
 
                         if (isRelease()) {
                             releaseUtils.gpgImportKeyFromStringWithoutPassword(getReleaseGpgSignKeyCredsId())
-                            mavenCommand.withProfiles(['apache-release'])
+                            mavenCommand
+                            .withProfiles(['apache-release'])
+                            .withProperty('only.reproducible')
                         }
 
                         configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {

diff --git a/...ration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml b/...ration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml
@@ -100,18 +100,39 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.basedir}/src/main/resources/shared</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${common.test.resources.dir}</directory>
+                  <includes>
+                    <include>**/*.bpmn</include>
+                    <include>**/*.sw.json</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${project.basedir}/src/main/resources/shared</directory>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
     </plugins>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${common.test.resources.dir}</directory>
-        <includes>
-          <include>**/*.bpmn</include>
-          <include>**/*.sw.json</include>
-        </includes>
-      </resource>
-    </resources>
   </build>
 </project>
diff --git a/...ests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml b/...ests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml
@@ -88,18 +88,39 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.basedir}/src/main/resources/shared</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${common.test.resources.dir}</directory>
+                  <includes>
+                    <include>**/*.bpmn</include>
+                    <include>**/*.sw.json</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${project.basedir}/src/main/resources/shared</directory>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
     </plugins>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${common.test.resources.dir}</directory>
-        <includes>
-          <include>**/*.bpmn</include>
-          <include>**/*.sw.json</include>
-        </includes>
-      </resource>
-    </resources>
   </build>
 </project>
diff --git a/...tion-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml b/...tion-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml
@@ -79,7 +79,6 @@
       <plugin>
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-maven-plugin</artifactId>
-        <version>${version.io.quarkus}</version>
         <configuration>
           <skipOriginalJarRename>true</skipOriginalJarRename>
         </configuration>
@@ -91,18 +90,39 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.basedir}/src/main/resources/shared</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${common.test.resources.dir}</directory>
+                  <includes>
+                    <include>**/*.bpmn</include>
+                    <include>**/*.sw.json</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${project.basedir}/src/main/resources/shared</directory>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
     </plugins>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${common.test.resources.dir}</directory>
-        <includes>
-          <include>**/*.bpmn</include>
-          <include>**/*.sw.json</include>
-        </includes>
-      </resource>
-    </resources>
   </build>
 </project>
diff --git a/...ation-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml b/...ation-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
@@ -94,24 +94,10 @@
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${common.test.resources.dir}</directory>
-        <includes>
-          <include>**/*.bpmn</include>
-          <include>**/*.sw.json</include>
-        </includes>
-      </resource>
-    </resources>
-
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-maven-plugin</artifactId>
-        <version>${version.io.quarkus}</version>
         <configuration>
           <skipOriginalJarRename>true</skipOriginalJarRename>
         </configuration>
@@ -123,6 +109,39 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.basedir}/src/main/resources/shared</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${common.test.resources.dir}</directory>
+                  <includes>
+                    <include>**/*.bpmn</include>
+                    <include>**/*.sw.json</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${project.basedir}/src/main/resources/shared</directory>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/...on-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml b/...on-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml
@@ -87,10 +87,6 @@
       <artifactId>kogito-test-utils</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/...-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java b/...-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java
@@ -29,7 +29,6 @@
 import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Test;
-import org.keycloak.representations.AccessTokenResponse;
 import org.kie.kogito.explainability.api.CounterfactualSearchDomain;
 import org.kie.kogito.explainability.api.CounterfactualSearchDomainCollectionValue;
 import org.kie.kogito.explainability.api.CounterfactualSearchDomainStructureValue;
@@ -183,7 +182,7 @@ public void doTest() {
                     .param(KEYCLOAK_CLIENT_SECRET_PARAM_NAME, KEYCLOAK_CLIENT_SECRET_PARAM_VALUE)
                     .when()
                     .post(KEYCLOAK_ACCESS_TOKEN_PATH)
-                    .as(AccessTokenResponse.class).getToken();
+                    .jsonPath().get("access_token");
 
             assertNotNull(accessToken);
 

diff --git a/...ests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml b/...ests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml
@@ -33,7 +33,7 @@
   <properties>
     <container.image.kogito-service>org.kie.kogito/integration-tests-trusty-service-springboot:${project.version}</container.image.kogito-service>
     <sonar.exclusions>**/KogitoApplication.java</sonar.exclusions>
-    <version.jib-maven-plugin>3.3.1</version.jib-maven-plugin>
+    <version.jib-maven-plugin>3.4.4</version.jib-maven-plugin>
     <jib-maven-plugin.container.image>eclipse-temurin:17-jre</jib-maven-plugin.container.image>
   </properties>
 

diff --git a/data-index/data-index-graphql/src/main/resources/basic.schema.graphqls b/data-index/data-index-graphql/src/main/resources/basic.schema.graphqls
@@ -96,6 +96,7 @@ type ProcessInstance {
     identity: String
     createdBy: String
     updatedBy: String
+    slaDueDate: DateTime
 }
 
 type ProcessInstanceError {
@@ -135,6 +136,7 @@ type NodeInstance {
     exit: DateTime
     definitionId: String!
     nodeId: String!
+    slaDueDate: DateTime
 }
 
 enum MilestoneStatus {

diff --git a/data-index/data-index-service/data-index-service-common/pom.xml b/data-index/data-index-service/data-index-service-common/pom.xml
@@ -141,11 +141,6 @@
       <artifactId>json-unit-assertj</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-quarkus-test-utils</artifactId>

diff --git a/.../test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java b/.../test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java
@@ -20,7 +20,6 @@
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.junit.jupiter.api.Test;
-import org.keycloak.representations.AccessTokenResponse;
 import org.kie.kogito.testcontainers.KogitoKeycloakContainer;
 import org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource;
 
@@ -97,6 +96,6 @@ private String getAccessToken(String userName) {
                 .param("client_secret", KogitoKeycloakContainer.CLIENT_SECRET)
                 .when()
                 .post(keycloakURL + "/protocol/openid-connect/token")
-                .as(AccessTokenResponse.class).getToken();
+                .jsonPath().get("access_token");
     }
 }
diff --git a/data-index/data-index-service/data-index-service-infinispan/pom.xml b/data-index/data-index-service/data-index-service-infinispan/pom.xml
@@ -101,11 +101,6 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

diff --git a/data-index/data-index-service/data-index-service-inmemory/pom.xml b/data-index/data-index-service/data-index-service-inmemory/pom.xml
@@ -89,11 +89,6 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

diff --git a/data-index/data-index-service/data-index-service-mongodb/pom.xml b/data-index/data-index-service/data-index-service-mongodb/pom.xml
@@ -95,11 +95,6 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

diff --git a/data-index/data-index-service/data-index-service-postgresql/pom.xml b/data-index/data-index-service/data-index-service-postgresql/pom.xml
@@ -94,11 +94,6 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>