Merge pull request #776 from jonesbusy/feature/recipe-filtering

Recipe filtering
jenkins-infra · Feb 6, 2025 · 302b4d2 · 302b4d2
2 parents efa7433 + a372713
commit 302b4d2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/plugin-modernizer-core/pom.xml b/plugin-modernizer-core/pom.xml
@@ -218,7 +218,7 @@
       </resource>
       <resource>
         <targetPath>META-INF/rewrite</targetPath>
-        <filtering>false</filtering>
+        <filtering>true</filtering>
         <directory>src/main/resources/META-INF/rewrite</directory>
         <includes>
           <include>recipes.yml</include>

diff --git a/plugin-modernizer-core/src/main/resources/META-INF/rewrite/recipes.yml b/plugin-modernizer-core/src/main/resources/META-INF/rewrite/recipes.yml
@@ -388,9 +388,9 @@ recipeList:
   - io.jenkins.tools.pluginmodernizer.UpgradeParentVersion
   - io.jenkins.tools.pluginmodernizer.AddPluginsBom
   - io.jenkins.tools.pluginmodernizer.core.recipes.UpgradeJenkinsVersion:
-      minimumVersion: 2.462.3
+      minimumVersion: ${jenkins.core.minimum.version}
   - io.jenkins.tools.pluginmodernizer.core.recipes.UpgradeJenkinsTestHarnessVersion:
-      jenkinsVersion: 2.462.3
+      jenkinsVersion: ${jenkins.core.minimum.version}
   - io.jenkins.tools.pluginmodernizer.RemoveDependencyVersionOverride
   - io.jenkins.tools.pluginmodernizer.RemoveExtraMavenProperties
   - io.jenkins.tools.pluginmodernizer.UpgradeBomVersion
@@ -488,7 +488,7 @@ description: Check if the plugin is using the recommended core version
 tags: ['condition']
 recipeList:
   - org.openrewrite.jenkins.IsJenkinsPlugin:
-      version: "[2.462.3,)"
+      version: "[${jenkins.core.minimum.version},)"
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: io.jenkins.tools.pluginmodernizer.conditions.IsUsingCoreVersionWithASMRemoved

diff --git a/.../src/test/java/io/jenkins/tools/pluginmodernizer/core/recipes/DeclarativeRecipesTest.java b/.../src/test/java/io/jenkins/tools/pluginmodernizer/core/recipes/DeclarativeRecipesTest.java
@@ -702,8 +702,8 @@ void upgradeToRecommendCoreVersionTest() {
                           <properties>
                             <jenkins-test-harness.version>2225.v04fa_3929c9b_5</jenkins-test-harness.version>
                             <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-                            <jenkins.baseline>2.462</jenkins.baseline>
-                            <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+                            <jenkins.baseline>%s</jenkins.baseline>
+                            <jenkins.version>${jenkins.baseline}.%s</jenkins.version>
                           </properties>
                           <dependencyManagement>
                             <dependencies>
@@ -740,7 +740,10 @@ void upgradeToRecommendCoreVersionTest() {
                           </pluginRepositories>
                         </project>
                         """
-                                .formatted(Settings.getBomVersion())));
+                                .formatted(
+                                        Settings.getJenkinsMinimumBaseline(),
+                                        Settings.getJenkinsMinimumPatchVersion(),
+                                        Settings.getBomVersion())));
     }
 
     @Test
@@ -818,7 +821,7 @@ void upgradeToRecommendCoreVersionTestWithoutPluginDependencies() {
                             <connection>scm:git:https://github.com/jenkinsci/empty-plugin.git</connection>
                           </scm>
                           <properties>
-                            <jenkins.version>2.462.3</jenkins.version>
+                            <jenkins.version>%s</jenkins.version>
                             <jenkins-test-harness.version>2225.v04fa_3929c9b_5</jenkins-test-harness.version>
                           </properties>
                           <repositories>
@@ -835,7 +838,7 @@ void upgradeToRecommendCoreVersionTestWithoutPluginDependencies() {
                           </pluginRepositories>
                         </project>
                         """
-                                .formatted(Settings.getBomVersion())));
+                                .formatted(Settings.getJenkinsMinimumVersion())));
     }
 
     @Test
@@ -925,8 +928,8 @@ void upgradeToRecommendCoreVersionTestWithBaseline() {
                           <properties>
                             <jenkins-test-harness.version>2225.v04fa_3929c9b_5</jenkins-test-harness.version>
                             <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-                            <jenkins.baseline>2.462</jenkins.baseline>
-                            <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+                            <jenkins.baseline>%s</jenkins.baseline>
+                            <jenkins.version>${jenkins.baseline}.%s</jenkins.version>
                           </properties>
                           <dependencyManagement>
                             <dependencies>
@@ -959,7 +962,10 @@ void upgradeToRecommendCoreVersionTestWithBaseline() {
                           </pluginRepositories>
                         </project>
                         """
-                                .formatted(Settings.getBomVersion())));
+                                .formatted(
+                                        Settings.getJenkinsMinimumBaseline(),
+                                        Settings.getJenkinsMinimumPatchVersion(),
+                                        Settings.getBomVersion())));
     }
 
     @Test
@@ -1069,8 +1075,8 @@ void upgradeToRecommendCoreVersionTestWithMultipleBom() {
                         <revision>2.17.0</revision>
                         <changelist>999999-SNAPSHOT</changelist>
                         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-                        <jenkins.baseline>2.462</jenkins.baseline>
-                        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+                        <jenkins.baseline>%s</jenkins.baseline>
+                        <jenkins.version>${jenkins.baseline}.%s</jenkins.version>
                       </properties>
                       <repositories>
                         <repository>
@@ -1118,7 +1124,10 @@ void upgradeToRecommendCoreVersionTestWithMultipleBom() {
                       </dependencies>
                     </project>
                     """
-                                .formatted(Settings.getBomVersion())));
+                                .formatted(
+                                        Settings.getJenkinsMinimumBaseline(),
+                                        Settings.getJenkinsMinimumPatchVersion(),
+                                        Settings.getBomVersion())));
     }
 
     @Test