Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quarkus 3: Update recipe #1777

Merged
merged 6 commits into from
Sep 1, 2023
Merged

Quarkus 3: Update recipe #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa766bb
Quarkus 3: Update recipe
radtriste Aug 30, 2023
4d5fdc6
Fix CI
radtriste Aug 31, 2023
af0e2ed
update jenkinsfiles
radtriste Aug 31, 2023
6c8b95e
updated jenkinsfiles
radtriste Aug 31, 2023
32129f1
[Quarkus 3] Updated rewrite data
Aug 31, 2023
d826c0f
removed useless patch
radtriste Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
707 changes: 358 additions & 349 deletions .ci/environments/quarkus-3/patches/0001_before_sh.patch
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions .ci/environments/quarkus-3/patches/0005_spring_boot_openapi.patch
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions .ci/environments/quarkus-3/project-recipe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
28 changes: 17 additions & 11 deletions .ci/environments/quarkus-3/quarkus3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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')
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions .ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ previousHash = ''

pipeline {
agent {
label 'kie-rhel8 && kie-mem16g && !built-in'
label 'kie-rhel8 && docker && kie-mem16g && !built-in'
}

tools {
Expand Down Expand Up @@ -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')
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/dsl/jobs.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading