[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]>
apache · Jan 28, 2022 · 8e07f18 · 8e07f18
1 parent a309e44
commit 8e07f18
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 22 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/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