[main] Bump Quarkus version to 2.7.0.Final (#1903)

* [main] Bump Quarkus version to 2.7.0.CR1 * update to 2.7.0.Final * [1.16.x] Bump Quarkus version to 2.7.0.Final (#1902) * [1.16.x] Bump Quarkus version to 2.7.0.CR1 * fallback assertj version * temporary solution for classloading tests * temporary solution for classloading tests (2) * correct kafka persistence test * updated to 2.7.0.Final * updated to 2.7.0.Final * trigger pr * update * trigger * Revert "trigger" This reverts commit ae2be91. Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com> Co-authored-by: radtriste <[email protected]> Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com> Co-authored-by: radtriste <[email protected]>
apache · Feb 1, 2022 · 5c8e486 · 5c8e486
1 parent e71d3be
commit 5c8e486
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 32 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
@@ -101,7 +101,13 @@ pipeline {
         stage('Build & Test') {
             steps {
                 script {
-                    getMavenCommand().withProperty('maven.test.failure.ignore', true).skipTests(params.SKIP_TESTS).run('clean install')
+                    getMavenCommand()
+                        .withProperty('maven.test.failure.ignore', true)
+                        // `-Dquarkus.bootstrap.effective-model-builder` is a temporary fix due to quarkus resolver on tests
+                        // https://github.com/quarkusio/quarkus/issues/23205
+                        .withProperty('quarkus.bootstrap.effective-model-builder', true)
+                        .skipTests(params.SKIP_TESTS)
+                        .run('clean install')
                 }
             }
             post {

diff --git a/.ci/jenkins/Jenkinsfile.native b/.ci/jenkins/Jenkinsfile.native
@@ -52,6 +52,9 @@ pipeline {
                 script {
                     getNativeMavenCommand('kogito-runtimes')
                         .withProperty('maven.test.failure.ignore', true)
+                        // `-Dquarkus.bootstrap.effective-model-builder` is a temporary fix due to quarkus resolver on tests
+                        // https://github.com/quarkusio/quarkus/issues/23205
+                        .withProperty('quarkus.bootstrap.effective-model-builder', true)
                         .run('clean install')
                 }
             }

diff --git a/.ci/jenkins/Jenkinsfile.quarkus b/.ci/jenkins/Jenkinsfile.quarkus
@@ -76,6 +76,9 @@ pipeline {
                 script {
                     getMavenCommand('kogito-runtimes')
                         .withProperty('maven.test.failure.ignore', true)
+                        // `-Dquarkus.bootstrap.effective-model-builder` is a temporary fix due to quarkus resolver on tests
+                        // https://github.com/quarkusio/quarkus/issues/23205
+                        .withProperty('quarkus.bootstrap.effective-model-builder', true)
                         .run('clean install')
                 }
             }
@@ -89,25 +92,6 @@ pipeline {
                 }
             }
         }
-        stage('Check Runtimes integration-tests with persistence') {
-            steps {
-                script {
-                    getMavenCommand('integration-tests')
-                        .withProfiles(['persistence'])
-                        .withProperty('maven.test.failure.ignore', true)
-                        .run('clean verify')
-                }
-            }
-            post {
-                always {
-                    script {
-                        junit testResults: '**/target/surefire-reports/**/*.xml, **/target/failsafe-reports/**/*.xml', allowEmptyResults: true
-                        util.archiveConsoleLog()
-                        cleanContainers()
-                    }
-                }
-            }
-        }
         stage('Build optaplanner') {
             steps {
                 script {

diff --git a/.ci/jenkins/Jenkinsfile.sonarcloud b/.ci/jenkins/Jenkinsfile.sonarcloud
@@ -34,6 +34,9 @@ pipeline {
                 script {
                     getMavenCommand()
                         .withProfiles(['run-code-coverage'])
+                        // `-Dquarkus.bootstrap.effective-model-builder` is a temporary fix due to quarkus resolver on tests
+                        // https://github.com/quarkusio/quarkus/issues/23205
+                        .withProperty('quarkus.bootstrap.effective-model-builder', true)
                         .run('clean install')
                 }
             }

diff --git a/.../integration-tests-quarkus-processes-infinispan/src/test/resources/application.properties b/.../integration-tests-quarkus-processes-infinispan/src/test/resources/application.properties
@@ -2,4 +2,7 @@
 quarkus.http.test-port=0
 quarkus.infinispan-client.devservices.enabled=false
 
-kogito.persistence.type=infinispan
+kogito.persistence.type=infinispan
+
+# Temporary fix for test to pass due to issue in Quarkus classloading resolver
+quarkus.class-loading.parent-first-artifacts=org.testcontainers:testcontainers
diff --git a/...stence/integration-tests-quarkus-processes-jdbc/src/test/resources/application.properties b/...stence/integration-tests-quarkus-processes-jdbc/src/test/resources/application.properties
@@ -5,3 +5,5 @@ quarkus.datasource.devservices.enabled=false
 #run create tables scripts
 kogito.persistence.auto.ddl=true
 
+# Temporary fix for test to pass due to issue in Quarkus classloading resolver
+quarkus.class-loading.parent-first-artifacts=org.testcontainers:testcontainers
diff --git a/...ation-tests-quarkus-processes-kafka-persistence/src/test/resources/application.properties b/...ation-tests-quarkus-processes-kafka-persistence/src/test/resources/application.properties
@@ -4,3 +4,6 @@ quarkus.http.test-port=0
 kogito.persistence.type=kafka
 quarkus.kafka-streams.application-id=kogito
 kafka.bootstrap.servers=localhost:9092
+
+# Temporary fix for test to pass due to issue in Quarkus classloading resolver
+quarkus.class-loading.parent-first-artifacts=org.testcontainers:testcontainers,com.github.docker-java:docker-java-api
diff --git a/...nce/integration-tests-quarkus-processes-mongodb/src/test/resources/application.properties b/...nce/integration-tests-quarkus-processes-mongodb/src/test/resources/application.properties
@@ -4,4 +4,7 @@ quarkus.http.test-port=0
 kogito.persistence.type=mongodb
 # MongoDB
 quarkus.mongodb.database=kogito
-quarkus.mongodb.devservices.enabled=false
+quarkus.mongodb.devservices.enabled=false
+
+# Temporary fix for test to pass due to issue in Quarkus classloading resolver
+quarkus.class-loading.parent-first-artifacts=org.testcontainers:testcontainers
diff --git a/.../integration-tests-quarkus-processes-postgresql/src/test/resources/application.properties b/.../integration-tests-quarkus-processes-postgresql/src/test/resources/application.properties
@@ -11,3 +11,6 @@ quarkus.datasource.reactive.url=postgresql://localhost:5432/kogito
 #run create tables scripts
 kogito.persistence.auto.ddl=true
 
+# Temporary fix for test to pass due to issue in Quarkus classloading resolver
+quarkus.class-loading.parent-first-artifacts=org.testcontainers:testcontainers
+
diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -16,12 +16,12 @@
 
   <properties>
     <!-- this version property is used in plugins but also in dependencies too -->
-    <version.io.quarkus>2.6.2.Final</version.io.quarkus>
-    <version.io.quarkus.quarkus-test-maven>2.6.2.Final</version.io.quarkus.quarkus-test-maven>
+    <version.io.quarkus>2.7.0.Final</version.io.quarkus>
+    <version.io.quarkus.quarkus-test-maven>2.7.0.Final</version.io.quarkus.quarkus-test-maven>
     <version.org.springframework.boot>2.3.10.RELEASE</version.org.springframework.boot>
 
     <!-- dependencies versions -->
-    <version.com.fasterxml.jackson>2.12.6</version.com.fasterxml.jackson>
+    <version.com.fasterxml.jackson>2.13.1</version.com.fasterxml.jackson>
     <version.com.jayway.jsonpath>2.6.0</version.com.jayway.jsonpath>
     <version.net.thisptr.jackson-jq>1.0.0-preview.20210928</version.net.thisptr.jackson-jq>
     <version.io.quarkiverse.jackson-jq>1.0.1</version.io.quarkiverse.jackson-jq>
@@ -31,7 +31,7 @@
     <version.com.github.java-json-tools>2.2.10</version.com.github.java-json-tools>
     <version.com.github.victools>4.18.0</version.com.github.victools>
     <version.com.github.tomakehurst.wiremock>2.27.2</version.com.github.tomakehurst.wiremock>
-    <version.com.google.protobuf>3.19.2</version.com.google.protobuf>
+    <version.com.google.protobuf>3.19.3</version.com.google.protobuf>
     <!-- currently required for integration test only -->
     <version.com.oracle.database.jdbc>21.3.0.0</version.com.oracle.database.jdbc>
 
@@ -51,12 +51,12 @@
 
     <version.io.cloudevents>2.2.0</version.io.cloudevents>
     <version.io.fabric8.kubernetes-client>5.8.0</version.io.fabric8.kubernetes-client>
-    <version.io.micrometer>1.8.1</version.io.micrometer>
+    <version.io.micrometer>1.8.2</version.io.micrometer>
     <version.io.serverlessworkflow>4.0.1.Final</version.io.serverlessworkflow>
     <version.io.smallrye-open-api-core>2.1.17</version.io.smallrye-open-api-core>
-    <version.io.smallrye.reactive.mutiny-vertx-web-client>2.16.0</version.io.smallrye.reactive.mutiny-vertx-web-client>
+    <version.io.smallrye.reactive.mutiny-vertx-web-client>2.18.1</version.io.smallrye.reactive.mutiny-vertx-web-client>
 
-    <version.io.vertx>4.2.2</version.io.vertx>
+    <version.io.vertx>4.2.4</version.io.vertx>
 
     <version.io.swagger.parser.v3>2.0.24</version.io.swagger.parser.v3>
 
@@ -69,7 +69,7 @@
     <version.org.infinispan.protostream>4.4.1.Final</version.org.infinispan.protostream>
     <!-- consider migrating to 3.x JDK 9: https://jakarta.ee/specifications/restful-ws/ -->
     <version.jakarta.ws.rs>2.1.6</version.jakarta.ws.rs>
-    <version.org.jboss.resteasy>4.7.4.Final</version.org.jboss.resteasy>
+    <version.org.jboss.resteasy>4.7.5.Final</version.org.jboss.resteasy>
     <version.org.keycloak>14.0.0</version.org.keycloak>
     <version.org.confluent.kafka>5.4.3</version.org.confluent.kafka>
     <version.org.mongo>4.3.4</version.org.mongo>
@@ -85,8 +85,8 @@
     <version.org.junit.jupiter>5.8.2</version.org.junit.jupiter>
     <version.org.junit.vintage>5.8.2</version.org.junit.vintage>
     <version.org.junit.platform>1.8.2</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
-    <version.org.junit.pioneer>1.4.2</version.org.junit.pioneer>
-    <version.org.mockito>4.1.0</version.org.mockito>
+    <version.org.junit.pioneer>1.5.0</version.org.junit.pioneer>
+    <version.org.mockito>4.3.1</version.org.mockito>
     <version.org.testcontainers>1.16.2</version.org.testcontainers>
 
     <version.org.mvel>2.4.12.Final</version.org.mvel>

diff --git a/pom.xml b/pom.xml
@@ -18,6 +18,7 @@
   <name>Kogito Runtimes</name>
   <description>Kogito Runtimes</description>
 
+
   <url>http://kogito.kie.org</url>
   <inceptionYear>2019</inceptionYear>
   <organization>

diff --git a/quarkus/addons/persistence/infinispan/health/src/test/resources/application.properties b/quarkus/addons/persistence/infinispan/health/src/test/resources/application.properties
@@ -0,0 +1,3 @@
+# Quarkus
+# Temporary fix for test to pass due to issue in Quarkus classloading resolver
+quarkus.class-loading.parent-first-artifacts=org.testcontainers:testcontainers