Skip to content

Fix order of property migrate and ensure it's validate with a test when a bom is added #529

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

Merged
jonesbusy merged 1 commit into from
Dec 29, 2024
Merged

Fix order of property migrate and ensure it's validate with a test when a bom is added #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions plugin-modernizer-core/src/main/resources/META-INF/rewrite/recipes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ displayName: Upgrade to the next major parent version (5.X) requiring Jenkins 2.
description: Upgrade to the next major parent version (5.X) requiring Jenkins 2.479 and Java 17.
tags: ['dependencies']
recipeList:
- io.jenkins.tools.pluginmodernizer.MigrateToJenkinsBaseLineProperty
- org.openrewrite.maven.UpgradeParentVersion:
groupId: org.jenkins-ci.plugins
artifactId: plugin
Expand All @@ -163,6 +162,7 @@ recipeList:
- io.jenkins.tools.pluginmodernizer.RemoveDependencyVersionOverride
- org.openrewrite.maven.RemoveProperty: # Set by 5.x parent, ensure it's removed
propertyName: maven.compiler.release
- io.jenkins.tools.pluginmodernizer.MigrateToJenkinsBaseLineProperty
---
type: specs.openrewrite.org/v1beta/recipe
name: io.jenkins.tools.pluginmodernizer.UpgradeBomVersion
Expand Down Expand Up @@ -372,35 +372,34 @@ displayName: Upgrade to latest recommended core version and ensure the bom is ma
description: Upgrade to latest recommended core version and ensure the bom is matching the core version.
tags: ['developer']
recipeList:
- io.jenkins.tools.pluginmodernizer.MigrateToJenkinsBaseLineProperty
- io.jenkins.tools.pluginmodernizer.UpgradeParentVersion
- io.jenkins.tools.pluginmodernizer.core.recipes.UpgradeJenkinsVersion:
minimumVersion: 2.452.4
- io.jenkins.tools.pluginmodernizer.RemoveDependencyVersionOverride
- io.jenkins.tools.pluginmodernizer.RemoveExtraMavenProperties
- io.jenkins.tools.pluginmodernizer.UpgradeBomVersion
- io.jenkins.tools.pluginmodernizer.MigrateToJenkinsBaseLineProperty
---
type: specs.openrewrite.org/v1beta/recipe
name: io.jenkins.tools.pluginmodernizer.UpgradeToLatestJava11CoreVersion
displayName: Upgrade to latest LTS core version supporting Java 11
description: Upgrade to latest LTS core version supporting Java 11.
tags: ['developer']
recipeList:
- io.jenkins.tools.pluginmodernizer.MigrateToJenkinsBaseLineProperty
- io.jenkins.tools.pluginmodernizer.UpgradeParentVersion
- io.jenkins.tools.pluginmodernizer.core.recipes.UpgradeJenkinsVersion:
minimumVersion: 2.462.3
- io.jenkins.tools.pluginmodernizer.RemoveDependencyVersionOverride
- io.jenkins.tools.pluginmodernizer.RemoveExtraMavenProperties
- io.jenkins.tools.pluginmodernizer.UpgradeBomVersion
- io.jenkins.tools.pluginmodernizer.MigrateToJenkinsBaseLineProperty
---
type: specs.openrewrite.org/v1beta/recipe
name: io.jenkins.tools.pluginmodernizer.UpgradeToLatestJava8CoreVersion
displayName: Upgrade to latest LTS core version supporting Java 8
description: Upgrade to latest LTS core version supporting Java 8.
tags: ['developer']
recipeList:
- io.jenkins.tools.pluginmodernizer.MigrateToJenkinsBaseLineProperty
- org.openrewrite.maven.UpgradeParentVersion:
groupId: org.jenkins-ci.plugins
artifactId: plugin
Expand All @@ -410,6 +409,7 @@ recipeList:
- io.jenkins.tools.pluginmodernizer.RemoveDependencyVersionOverride
- io.jenkins.tools.pluginmodernizer.RemoveExtraMavenProperties
- io.jenkins.tools.pluginmodernizer.UpgradeBomVersion
- io.jenkins.tools.pluginmodernizer.MigrateToJenkinsBaseLineProperty
---
type: specs.openrewrite.org/v1beta/recipe
name: io.jenkins.tools.pluginmodernizer.SetupDependabot
Expand Down
30 changes: 28 additions & 2 deletions .../src/test/java/io/jenkins/tools/pluginmodernizer/core/recipes/DeclarativeRecipesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ void shouldAddCodeOwnerIfNeeded() {
}

@Test
void upgradeParentBom() {
void upgradeParentpom() {
rewriteRun(
spec -> spec.recipeFromResource(
"/META-INF/rewrite/recipes.yml", "io.jenkins.tools.pluginmodernizer.UpgradeParentVersion"),
Expand Down Expand Up @@ -472,6 +472,13 @@ void upgradeToRecommendCoreVersionTest() {
<properties>
<jenkins.version>2.440.3</jenkins.version>
</properties>
<dependencies>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>asm-api</artifactId>
<version>9.6-3.v2e1fa_b_338cd7</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
Expand Down Expand Up @@ -502,8 +509,27 @@ void upgradeToRecommendCoreVersionTest() {
<packaging>hpi</packaging>
<name>Empty Plugin</name>
<properties>
<jenkins.version>2.452.4</jenkins.version>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.452</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.4</jenkins.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>3850.vb_c5319efa_e29</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>asm-api</artifactId>
</dependency>
</dependencies>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
Expand Down