From 859978a1a50eb25bdd8f94a0c447519edbda0393 Mon Sep 17 00:00:00 2001 From: Tristan Radisson Date: Mon, 31 Jul 2023 13:55:03 +0200 Subject: [PATCH] Quarkus 3: Fix patches (#3141) * Quarkus 3: Fix patches * updated before.sh * Updated Jenkinsfiles * [Quarkus 3] Updated rewrite data --------- Co-authored-by: radtriste Co-authored-by: Jenkins CI --- .ci/environments/quarkus-3/before.sh | 1 + .../quarkus-3/patches/0001_before_sh.patch | 17 +++++++++++++++++ .../quarkus-3/patches/0013_kube_addon.patch | 8 ++++---- .ci/environments/quarkus-3/quarkus3.yml | 14 +++++++------- .ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr | 6 +++--- .../Jenkinsfile.quarkus-3.rewrite.standalone | 6 +++--- 6 files changed, 35 insertions(+), 17 deletions(-) diff --git a/.ci/environments/quarkus-3/before.sh b/.ci/environments/quarkus-3/before.sh index 65189ea6e5c..c0a4a96f816 100755 --- a/.ci/environments/quarkus-3/before.sh +++ b/.ci/environments/quarkus-3/before.sh @@ -52,6 +52,7 @@ ${mvn_cmd} org.openrewrite.maven:rewrite-maven-plugin:${rewrite_plugin_version}: -Drewrite.recipeArtifactCoordinates=org.kie:jpmml-migration-recipe:"${drools_version}" \ -Denforcer.skip \ -fae \ + -Dfull \ -Dexclusions=**/target \ -DplainTextMasks=**/kmodule.xml diff --git a/.ci/environments/quarkus-3/patches/0001_before_sh.patch b/.ci/environments/quarkus-3/patches/0001_before_sh.patch index 708254e7b89..daac0f3b798 100644 --- a/.ci/environments/quarkus-3/patches/0001_before_sh.patch +++ b/.ci/environments/quarkus-3/patches/0001_before_sh.patch @@ -2572,6 +2572,23 @@ index 295de81ef7..e85b0f8c09 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.svg.AbstractProcessSvgService; +diff --git a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java +index 9316ad12b6..fc98d52f66 100644 +--- a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java ++++ b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java +@@ -15,9 +15,9 @@ + */ + package org.kie.kogito.quarkus.serverless.workflow.python; + +-import javax.annotation.PostConstruct; +-import javax.annotation.PreDestroy; +-import javax.enterprise.context.ApplicationScoped; ++import jakarta.annotation.PostConstruct; ++import jakarta.annotation.PreDestroy; ++import jakarta.enterprise.context.ApplicationScoped; + + import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler; + import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig; diff --git a/quarkus/addons/rest-exception-handler/pom.xml b/quarkus/addons/rest-exception-handler/pom.xml index d0ffa42730..abbc56828f 100644 --- a/quarkus/addons/rest-exception-handler/pom.xml diff --git a/.ci/environments/quarkus-3/patches/0013_kube_addon.patch b/.ci/environments/quarkus-3/patches/0013_kube_addon.patch index 9a21f3ae255..4bdc59625d2 100644 --- a/.ci/environments/quarkus-3/patches/0013_kube_addon.patch +++ b/.ci/environments/quarkus-3/patches/0013_kube_addon.patch @@ -465,15 +465,15 @@ index 8edc43c794..4e5c4aa457 100644 pod.getSpec().getContainers().get(0).getPorts() .add(new ContainerPortBuilder() diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java -index 30f90e0927..8ab3ec6652 100644 +index c156609e02..4b33ba5402 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java -@@ -34,7 +34,7 @@ public final class KnativeResourceDiscoveryTestUtil { +@@ -38,7 +38,7 @@ public final class KnativeResourceDiscoveryTestUtil { Service service = knativeClient.services() .inNamespace(namespace) .load(getResourceAsStream(knativeYaml)) - .get(); + .item(); - service.getStatus().setUrl(remoteServiceUrl); - + if (remoteServiceUrl != null) { + service.getStatus().setUrl(remoteServiceUrl); diff --git a/.ci/environments/quarkus-3/quarkus3.yml b/.ci/environments/quarkus-3/quarkus3.yml index 3f404f024de..674acaa1849 100644 --- a/.ci/environments/quarkus-3/quarkus3.yml +++ b/.ci/environments/quarkus-3/quarkus3.yml @@ -3,12 +3,12 @@ description: Update Quarkus version and refactor imports and resources if needed type: specs.openrewrite.org/v1beta/recipe recipeList: - org.openrewrite.maven.ChangePropertyValue: { - key: version.io.quarkus, - newValue: 3.0.0.Final + newValue: 3.0.0.Final, + key: version.io.quarkus } - org.openrewrite.maven.ChangePropertyValue: { - key: version.org.kie, - newValue: 9.43.0-SNAPSHOT + newValue: 9.43.0-SNAPSHOT, + key: version.org.kie } - org.kie.kogito.Quarkus3Migration - org.kie.ManagedDependencies @@ -143,9 +143,6 @@ recipeList: newArtifactId: infinispan-client-hotrod-jakarta } --- -name: org.kie.ManagedDependencies -description: Update all managed dependencies based on dependency updates from Quarkus. -type: specs.openrewrite.org/v1beta/recipe recipeList: - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: { oldGroupId: javax.activation, @@ -531,6 +528,9 @@ recipeList: newArtifactId: keycloak-admin-client-jakarta } displayName: Update Managed Dependencies +name: org.kie.ManagedDependencies +description: Update all managed dependencies based on dependency updates from Quarkus. +type: specs.openrewrite.org/v1beta/recipe --- type: specs.openrewrite.org/v1beta/recipe name: io.quarkus.updates.core.quarkus30.UpgradeQuarkiverse diff --git a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr index d1198d18f10..4c106b5660b 100644 --- a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr +++ b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr @@ -40,8 +40,8 @@ pipeline { script { dir('drools') { githubscm.checkoutIfExists('drools', changeAuthor, changeBranch, 'kiegroup', changeTarget, true) - sh '.ci/environments/update.sh quarkus-3' - getMavenCommand().withProperty('quickly').run('clean install') + util.runWithPythonVirtualEnv('.ci/environments/update.sh quarkus-3', 'swf') + util.runWithPythonVirtualEnv(getMavenCommand().withProperty('quickly').getFullRunCommand('clean install'), 'swf') } } } @@ -54,7 +54,7 @@ pipeline { env.BUILD_MVN_OPTS = "${env.BUILD_MVN_OPTS ?: ''} -s ${MAVEN_SETTINGS_FILE} -Dmaven.wagon.http.ssl.insecure=true -Dmaven.test.failure.ignore=true" echo "BUILD_MVN_OPTS = ${BUILD_MVN_OPTS}" - sh '.ci/environments/quarkus-3/before.sh rewrite' + util.runWithPythonVirtualEnv('.ci/environments/quarkus-3/before.sh rewrite', 'swf') } } } diff --git a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone index 679b6b29ca0..ba3a900627e 100644 --- a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone +++ b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone @@ -59,8 +59,8 @@ pipeline { script { dir('drools') { githubscm.checkoutIfExists('drools', getGitAuthor(), getBuildBranch(), getBaseAuthor(), getBaseBranch(), true) - sh '.ci/environments/update.sh quarkus-3' - getMavenCommand().withProperty('quickly').run('clean install') + util.runWithPythonVirtualEnv('.ci/environments/update.sh quarkus-3', 'swf') + util.runWithPythonVirtualEnv(getMavenCommand().withProperty('quickly').getFullRunCommand('clean install'), 'swf') } } } @@ -73,7 +73,7 @@ pipeline { env.BUILD_MVN_OPTS = "${env.BUILD_MVN_OPTS ?: ''} -s ${MAVEN_SETTINGS_FILE} -Dmaven.wagon.http.ssl.insecure=true -Dmaven.test.failure.ignore=true" echo "BUILD_MVN_OPTS = ${BUILD_MVN_OPTS}" - sh '.ci/environments/quarkus-3/before.sh rewrite' + util.runWithPythonVirtualEnv('.ci/environments/quarkus-3/before.sh rewrite', 'swf') } } }