Merge pull request #825 from gounthar/2.473.3

fix(recipes): update UpgradeNextMajorParentVersion recipe Jenkins version to 2.479.3

Author: jonesbusy

plugin-modernizer-core/src/main/resources/META-INF/rewrite/recipes.yml

@@ -149,9 +149,9 @@ recipeList:
       artifactId: plugin
       newVersion: 5.X
   - io.jenkins.tools.pluginmodernizer.core.recipes.UpgradeJenkinsVersion:
-      minimumVersion: 2.479.1
+      minimumVersion: 2.479.3
   - io.jenkins.tools.pluginmodernizer.core.recipes.UpgradeJenkinsTestHarnessVersion:
-      jenkinsVersion: 2.479.1
+      jenkinsVersion: 2.479.3
   - io.jenkins.tools.pluginmodernizer.core.recipes.MigrateStaplerAndJavaxToJakarta
   - io.jenkins.tools.pluginmodernizer.RemoveDevelopersTag
   - io.jenkins.tools.pluginmodernizer.RemoveDependencyVersionOverride

plugin-modernizer-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/model/JDKTest.java

@@ -60,7 +60,7 @@ public void min() {
         assertEquals(JDK.JAVA_8, JDK.min(Set.of(JDK.values()), "2.346.1"));
         assertEquals(JDK.JAVA_11, JDK.min(Set.of(JDK.values()), "2.361.1"));
         assertEquals(JDK.JAVA_11, JDK.min(Set.of(JDK.values()), "2.462.3"));
-        assertEquals(JDK.JAVA_17, JDK.min(Set.of(JDK.values()), "2.479.1"));
+        assertEquals(JDK.JAVA_17, JDK.min(Set.of(JDK.values()), "2.479.3"));
     }
 
     @Test
@@ -162,7 +162,7 @@ public void getLatestTestHarnessVersion() {
         assertEquals("2225.v04fa_3929c9b_5", JDK.getLatestTestHarnessVersion("2.426.1"));
         assertEquals("1900.v9e128c991ef4", JDK.getLatestTestHarnessVersion("2.346.1"));
         assertNull(JDK.getLatestTestHarnessVersion("2.463"));
-        assertNull(JDK.getLatestTestHarnessVersion("2.479.1"));
+        assertNull(JDK.getLatestTestHarnessVersion("2.479.3"));
         assertEquals("2225.v04fa_3929c9b_5", JDK.getLatestTestHarnessVersion("2.361.1"));
         assertEquals("1900.v9e128c991ef4", JDK.getLatestTestHarnessVersion("2.164.1"));
     }

plugin-modernizer-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/recipes/DeclarativeRecipesTest.java

@@ -1826,7 +1826,7 @@ void upgradeNextMajorParentVersionTest() {
                               </scm>
                               <properties>
                                 <jenkins-test-harness.version>%s</jenkins-test-harness.version>
-                                <jenkins.version>2.479.1</jenkins.version>
+                                <jenkins.version>2.479.3</jenkins.version>
                               </properties>
                               <repositories>
                                 <repository>
@@ -1978,7 +1978,7 @@ void upgradeNextMajorParentVersionTestWithBom() {
                             <jenkins-test-harness.version>%s</jenkins-test-harness.version>
                             <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
                             <jenkins.baseline>2.479</jenkins.baseline>
-                            <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+                            <jenkins.version>${jenkins.baseline}.3</jenkins.version>
                           </properties>
                           <dependencyManagement>
                             <dependencies>
@@ -2136,7 +2136,7 @@ void upgradeNextMajorParentVersionTestWithBaseline() {
                     <jenkins-test-harness.version>%s</jenkins-test-harness.version>
                     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
                     <jenkins.baseline>2.479</jenkins.baseline>
-                    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+                    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
                   </properties>
                   <dependencyManagement>
                     <dependencies>

plugin-modernizer-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/recipes/MigrateToJenkinsBaseLinePropertyTest.java

@@ -383,7 +383,7 @@ void testFixBom() {
                   <packaging>hpi</packaging>
                   <name>Empty Plugin</name>
                   <properties>
-                    <jenkins.version>2.479.1</jenkins.version>
+                    <jenkins.version>2.479.3</jenkins.version>
                   </properties>
                   <dependencyManagement>
                     <dependencies>
@@ -428,7 +428,7 @@ void testFixBom() {
                   <properties>
                     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
                     <jenkins.baseline>2.479</jenkins.baseline>
-                    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+                    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
                   </properties>
                   <dependencyManagement>
                     <dependencies>

plugin-modernizer-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/utils/JsonUtilsTest.java

@@ -20,10 +20,10 @@ public void testMetaDataToJson() {
         PluginMetadata metadata = new PluginMetadata();
         metadata.setKey("plugin-api-key");
         metadata.setFlags(Set.of(MetadataFlag.IS_API_PLUGIN));
-        metadata.setJenkinsVersion("2.479.1");
+        metadata.setJenkinsVersion("2.479.3");
         metadata.setErrors(Set.of(PreconditionError.MAVEN_REPOSITORIES_HTTP));
         assertEquals(
-                "{\"flags\":[\"IS_API_PLUGIN\"],\"errors\":[\"MAVEN_REPOSITORIES_HTTP\"],\"jenkinsVersion\":\"2.479.1\",\"key\":\"plugin-api-key\",\"path\":\".\"}",
+                "{\"flags\":[\"IS_API_PLUGIN\"],\"errors\":[\"MAVEN_REPOSITORIES_HTTP\"],\"jenkinsVersion\":\"2.479.3\",\"key\":\"plugin-api-key\",\"path\":\".\"}",
                 JsonUtils.toJson(metadata));
     }
 

plugin-modernizer-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/utils/TemplateUtilsTest.java

@@ -292,7 +292,7 @@ public void testFriendlyPrTitleUpgradeNextMajorParentVersion() {
         Recipe recipe = mock(Recipe.class);
 
         doReturn(metadata).when(plugin).getMetadata();
-        doReturn("2.479.1").when(metadata).getJenkinsVersion();
+        doReturn("2.479.3").when(metadata).getJenkinsVersion();
         doReturn("io.jenkins.tools.pluginmodernizer.UpgradeNextMajorParentVersion")
                 .when(recipe)
                 .getName();
@@ -301,7 +301,7 @@ public void testFriendlyPrTitleUpgradeNextMajorParentVersion() {
         String result = TemplateUtils.renderPullRequestTitle(plugin, recipe);
 
         // Assert
-        assertEquals("feat(java): Require Jenkins core 2.479.1 and Java 17.", result);
+        assertEquals("feat(java): Require Jenkins core 2.479.3 and Java 17.", result);
     }
 
     @Test
@@ -313,7 +313,7 @@ public void testFriendlyPrTitleMigrateToJenkinsBaseLineProperty() {
         Recipe recipe = mock(Recipe.class);
 
         doReturn(metadata).when(plugin).getMetadata();
-        doReturn("2.479.1").when(metadata).getJenkinsVersion();
+        doReturn("2.479.3").when(metadata).getJenkinsVersion();
         doReturn("io.jenkins.tools.pluginmodernizer.MigrateToJenkinsBaseLineProperty")
                 .when(recipe)
                 .getName();
@@ -335,7 +335,7 @@ public void testFriendlyPrBodyMigrateToJenkinsBaseLineProperty() {
         Recipe recipe = mock(Recipe.class);
 
         doReturn(metadata).when(plugin).getMetadata();
-        doReturn("2.479.1").when(metadata).getJenkinsVersion();
+        doReturn("2.479.3").when(metadata).getJenkinsVersion();
         doReturn("io.jenkins.tools.pluginmodernizer.MigrateToJenkinsBaseLineProperty")
                 .when(recipe)
                 .getName();

plugin-modernizer-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/visitors/UpdateJenkinsFileVisitorTest.java

@@ -144,7 +144,7 @@ void addOnePlatformConfigWithJenkinsVersion() {
                     public G.CompilationUnit visitCompilationUnit(
                             G.CompilationUnit cu, ExecutionContext executionContext) {
                         doAfterVisit(new UpdateJenkinsFileVisitor(
-                                null, null, List.of(PlatformConfig.build(Platform.LINUX, JDK.JAVA_17, "2.479.1"))));
+                                null, null, List.of(PlatformConfig.build(Platform.LINUX, JDK.JAVA_17, "2.479.3"))));
                         return super.visitCompilationUnit(cu, executionContext);
                     }
                 })),
@@ -162,7 +162,7 @@ public G.CompilationUnit visitCompilationUnit(
                   forkCount: '1C', // run this number of tests in parallel for faster feedback.  If the number terminates with a 'C', the value will be multiplied by the number of available CPU cores
                   useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
                   configurations: [
-                    [platform: 'linux', jdk: 17, jenkins: '2.479.1'],
+                    [platform: 'linux', jdk: 17, jenkins: '2.479.3'],
                 ])
                 """,
                         sourceSpecs -> {