Quarkus 3: Update recipe (#1777)

* Quarkus 3: Update recipe * Fix CI * update jenkinsfiles * updated jenkinsfiles * [Quarkus 3] Updated rewrite data * removed useless patch --------- Co-authored-by: Jenkins CI <[email protected]>
apache · Sep 1, 2023 · bb409b3 · bb409b3
1 parent fc858ec
commit bb409b3
Show file tree

Hide file tree

Showing 6 changed files with 385 additions and 365 deletions.
diff --git a/.ci/environments/quarkus-3/patches/0001_before_sh.patch b/.ci/environments/quarkus-3/patches/0001_before_sh.patch
diff --git a/.ci/environments/quarkus-3/project-recipe.yml b/.ci/environments/quarkus-3/project-recipe.yml
@@ -22,3 +22,8 @@ recipeList:
   - org.openrewrite.maven.ChangePropertyValue:
       key: version.org.apache.camel.quarkus
       newValue: 3.0.0-M1
+  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
+      oldGroupId: org.springdoc
+      oldArtifactId: springdoc-openapi-ui
+      newGroupId: org.springdoc
+      newArtifactId: springdoc-openapi-starter-webmvc-ui
diff --git a/.ci/environments/quarkus-3/quarkus3.yml b/.ci/environments/quarkus-3/quarkus3.yml
@@ -3,24 +3,24 @@ description: Update Quarkus version and refactor imports and resources if needed
 type: specs.openrewrite.org/v1beta/recipe
 recipeList:
 - org.openrewrite.maven.ChangePropertyValue: {
-    key: quarkus-plugin.version,
-    newValue: 3.0.0.Final
+    newValue: 3.0.0.Final,
+    key: quarkus-plugin.version
   }
 - org.openrewrite.maven.ChangePropertyValue: {
-    key: quarkus.platform.version,
-    newValue: 3.0.0.Final
+    newValue: 3.0.0.Final,
+    key: quarkus.platform.version
   }
 - org.openrewrite.maven.ChangePropertyValue: {
-    key: version.org.drools,
-    newValue: 9.44.0-SNAPSHOT
+    newValue: 9.44.0-SNAPSHOT,
+    key: version.org.drools
   }
 - org.openrewrite.maven.ChangePropertyValue: {
-    key: version.org.kie.kogito,
-    newValue: 3.0.0-SNAPSHOT
+    newValue: 3.0.0-SNAPSHOT,
+    key: version.org.kie.kogito
   }
 - org.openrewrite.maven.ChangePropertyValue: {
-    key: kogito.bom.version,
-    newValue: 3.0.0-SNAPSHOT
+    newValue: 3.0.0-SNAPSHOT,
+    key: kogito.bom.version
   }
 - org.kie.kogito.Quarkus3Migration
 - org.kie.ManagedDependencies
@@ -83,7 +83,14 @@ recipeList:
     key: version.org.apache.camel.quarkus,
     newValue: 3.0.0-M1
   }
+- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: {
+    oldGroupId: org.springdoc,
+    oldArtifactId: springdoc-openapi-ui,
+    newGroupId: org.springdoc,
+    newArtifactId: springdoc-openapi-starter-webmvc-ui
+  }
 ---
+displayName: Update Managed Dependencies
 recipeList:
 - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: {
     oldGroupId: javax.activation,
@@ -471,7 +478,6 @@ recipeList:
 type: specs.openrewrite.org/v1beta/recipe
 description: Update all managed dependencies based on dependency updates from Quarkus.
 name: org.kie.ManagedDependencies
-displayName: Update Managed Dependencies
 ---
 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
@@ -8,7 +8,7 @@ changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
 
 pipeline {
     agent {
-        label 'kie-rhel8 && kie-mem16g && !built-in'
+        label 'kie-rhel8 && docker && kie-mem16g && !built-in'
     }
     tools {
         maven env.BUILD_MAVEN_TOOL
@@ -56,7 +56,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
@@ -7,7 +7,7 @@ previousHash = ''
 
 pipeline {
     agent {
-        label 'kie-rhel8 && kie-mem16g && !built-in'
+        label 'kie-rhel8 && docker && kie-mem16g && !built-in'
     }
 
     tools {
@@ -75,7 +75,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/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
@@ -79,7 +79,7 @@ Closure setup4AMCronTriggerJobParamsGetter = { script ->
     return jobParams
 }
 Closure nightlyJobParamsGetter = isMainStream() ? JobParamsUtils.DEFAULT_PARAMS_GETTER : setup4AMCronTriggerJobParamsGetter
-KogitoJobUtils.createNightlyBuildChainBuildAndDeployJobForCurrentRepo(this, '', true, nightlyJobParamsGetter)
+KogitoJobUtils.createNightlyBuildChainBuildAndDeployJobForCurrentRepo(this, '', true)
 setupSpecificBuildChainNightlyJob('native', nightlyJobParamsGetter)
 setupNightlyQuarkusIntegrationJob('quarkus-main', nightlyJobParamsGetter)
 setupNightlyQuarkusIntegrationJob('quarkus-branch', nightlyJobParamsGetter)