From 8e07f18a3fbedb19c33305c3668bfa1d4e00ff71 Mon Sep 17 00:00:00 2001 From: kie-ci Date: Fri, 28 Jan 2022 14:20:31 +0100 Subject: [PATCH] [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 ae2be91e6ceab5dc65793aaed3689fff61338091. Co-authored-by: Jenkins CI Co-authored-by: radtriste --- .ci/jenkins/Jenkinsfile.deploy | 8 ++++++- .ci/jenkins/Jenkinsfile.native | 3 +++ .ci/jenkins/Jenkinsfile.quarkus | 22 +++---------------- .ci/jenkins/Jenkinsfile.sonarcloud | 3 +++ .../src/test/resources/application.properties | 5 ++++- .../src/test/resources/application.properties | 2 ++ .../src/test/resources/application.properties | 3 +++ .../src/test/resources/application.properties | 5 ++++- .../src/test/resources/application.properties | 3 +++ pom.xml | 1 + .../src/test/resources/application.properties | 3 +++ 11 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 quarkus/addons/persistence/infinispan/health/src/test/resources/application.properties diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy index 81aa24b240b..ddec1d48e8f 100644 --- 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 index bb5bd545e42..21e467b9c3c 100644 --- 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 index 1d36876678d..f2b0f2ab071 100644 --- 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 index 1f3867cfe2c..b6c24ab20b8 100644 --- 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/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/src/test/resources/application.properties b/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/src/test/resources/application.properties index 22734ab3792..fbcd116e98e 100644 --- a/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/src/test/resources/application.properties +++ b/integration-tests/integration-tests-quarkus-processes-persistence/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 \ No newline at end of file +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 \ No newline at end of file diff --git a/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/src/test/resources/application.properties b/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/src/test/resources/application.properties index 172f323b9a1..4040307dc22 100644 --- a/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/src/test/resources/application.properties +++ b/integration-tests/integration-tests-quarkus-processes-persistence/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/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-kafka-persistence/src/test/resources/application.properties b/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-kafka-persistence/src/test/resources/application.properties index b2b1d089294..5a20d16f66d 100644 --- a/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-kafka-persistence/src/test/resources/application.properties +++ b/integration-tests/integration-tests-quarkus-processes-persistence/integration-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/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-mongodb/src/test/resources/application.properties b/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-mongodb/src/test/resources/application.properties index a88cc3bc3ef..000dffd4f65 100644 --- a/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-mongodb/src/test/resources/application.properties +++ b/integration-tests/integration-tests-quarkus-processes-persistence/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 \ No newline at end of file +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 \ No newline at end of file diff --git a/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/src/test/resources/application.properties b/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/src/test/resources/application.properties index 161e147902c..7b5bc1c5778 100644 --- a/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/src/test/resources/application.properties +++ b/integration-tests/integration-tests-quarkus-processes-persistence/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 index c34f44020ee..9770eaa54fe 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ Kogito Runtimes Kogito Runtimes + http://kogito.kie.org 2019 diff --git a/quarkus/addons/persistence/infinispan/health/src/test/resources/application.properties b/quarkus/addons/persistence/infinispan/health/src/test/resources/application.properties new file mode 100644 index 00000000000..d716d5375bd --- /dev/null +++ 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