Merge pull request #612 from jonesbusy/feature/fix-tests-and-cleanup

Cleanup and fix tests
jenkins-infra · Jan 11, 2025 · b0bc748 · b0bc748
2 parents 9e787eb + f7e9aa1
commit b0bc748
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 390 deletions.
diff --git a/plugin-modernizer-core/pom.xml b/plugin-modernizer-core/pom.xml
@@ -16,7 +16,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-2.479.x</artifactId>
-        <version>3875.v1df09947cde6</version>
+        <version>3893.v213a_42768d35</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/...nizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/recipes/IsMissingBom.java b/...nizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/recipes/IsMissingBom.java
diff --git a/...java/io/jenkins/tools/pluginmodernizer/core/recipes/IsMissingJenkinsBaselineProperty.java b/...java/io/jenkins/tools/pluginmodernizer/core/recipes/IsMissingJenkinsBaselineProperty.java
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
@@ -112,8 +112,6 @@ name: io.jenkins.tools.pluginmodernizer.AddPluginsBom
 displayName: Add plugins BOM
 description: Add the Jenkins BOM to the dependenciesManagement section of the pom.xml.
 tags: ['chore', 'dependencies']
-preconditions:
-  - io.jenkins.tools.pluginmodernizer.core.recipes.IsMissingBom
 recipeList:
   - org.openrewrite.jenkins.AddPluginsBom
   - io.jenkins.tools.pluginmodernizer.MigrateToJenkinsBaseLineProperty
@@ -412,6 +410,7 @@ recipeList:
   - io.jenkins.tools.pluginmodernizer.EnsureIndexJelly
   - io.jenkins.tools.pluginmodernizer.core.recipes.UpdateScmUrl
   - io.jenkins.tools.pluginmodernizer.UpgradeParentVersion
+  - io.jenkins.tools.pluginmodernizer.AddPluginsBom
   - io.jenkins.tools.pluginmodernizer.core.recipes.UpgradeJenkinsVersion:
       minimumVersion: 2.452.4
   - io.jenkins.tools.pluginmodernizer.RemoveDependencyVersionOverride
@@ -429,6 +428,7 @@ recipeList:
   - io.jenkins.tools.pluginmodernizer.EnsureIndexJelly
   - io.jenkins.tools.pluginmodernizer.core.recipes.UpdateScmUrl
   - io.jenkins.tools.pluginmodernizer.UpgradeParentVersion
+  - io.jenkins.tools.pluginmodernizer.AddPluginsBom
   - io.jenkins.tools.pluginmodernizer.core.recipes.UpgradeJenkinsVersion:
       minimumVersion: 2.462.3
   - io.jenkins.tools.pluginmodernizer.RemoveDependencyVersionOverride
@@ -450,6 +450,7 @@ recipeList:
   - io.jenkins.tools.pluginmodernizer.core.recipes.EnsureRelativePath
   - io.jenkins.tools.pluginmodernizer.EnsureIndexJelly
   - io.jenkins.tools.pluginmodernizer.core.recipes.UpdateScmUrl
+  - io.jenkins.tools.pluginmodernizer.AddPluginsBom
   - org.openrewrite.maven.UpgradeParentVersion:
       groupId: org.jenkins-ci.plugins
       artifactId: plugin

diff --git a/plugin-modernizer-core/src/main/resources/versions.properties b/plugin-modernizer-core/src/main/resources/versions.properties
@@ -1,4 +1,4 @@
 openrewrite.maven.plugin.version = ${openrewrite.maven.plugin.version}
 jenkins.parent.version = 5.4
-bom.version = 3875.v1df09947cde6
+bom.version = 3893.v213a_42768d35
 remediation.jenkins.plugin.parent.version = 2.37
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
@@ -573,6 +573,94 @@ void upgradeToRecommendCoreVersionTest() {
                                 .formatted(Settings.getBomVersion())));
     }
 
+    @Test
+    void upgradeToRecommendCoreVersionTestWithoutPluginDependencies() {
+        rewriteRun(
+                spec -> spec.recipeFromResource(
+                        "/META-INF/rewrite/recipes.yml",
+                        "io.jenkins.tools.pluginmodernizer.UpgradeToRecommendCoreVersion"),
+                // language=xml
+                srcMainResources(text(
+                        null,
+                        EXPECTED_JELLY,
+                        s -> s.path(ArchetypeCommonFile.INDEX_JELLY.getPath().getFileName()))),
+                // language=xml
+                pomXml(
+                        """
+                        <?xml version="1.0" encoding="UTF-8"?>
+                        <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+                          <modelVersion>4.0.0</modelVersion>
+                          <parent>
+                            <groupId>org.jenkins-ci.plugins</groupId>
+                            <artifactId>plugin</artifactId>
+                            <version>4.87</version>
+                          </parent>
+                          <groupId>io.jenkins.plugins</groupId>
+                          <artifactId>empty</artifactId>
+                          <version>1.0.0-SNAPSHOT</version>
+                          <packaging>hpi</packaging>
+                          <name>Empty Plugin</name>
+                          <scm>
+                            <connection>scm:git:git://github.com/jenkinsci/empty-plugin.git</connection>
+                          </scm>
+                          <properties>
+                            <jenkins.version>2.440.3</jenkins.version>
+                             <maven.compiler.source>17</maven.compiler.source>
+                             <maven.compiler.release>17</maven.compiler.release>
+                             <maven.compiler.target>17</maven.compiler.target>
+                          </properties>
+                          <repositories>
+                            <repository>
+                              <id>repo.jenkins-ci.org</id>
+                              <url>https://repo.jenkins-ci.org/public/</url>
+                            </repository>
+                          </repositories>
+                          <pluginRepositories>
+                            <pluginRepository>
+                              <id>repo.jenkins-ci.org</id>
+                              <url>https://repo.jenkins-ci.org/public/</url>
+                            </pluginRepository>
+                          </pluginRepositories>
+                        </project>
+                        """,
+                        """
+                        <?xml version="1.0" encoding="UTF-8"?>
+                        <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+                          <modelVersion>4.0.0</modelVersion>
+                          <parent>
+                            <groupId>org.jenkins-ci.plugins</groupId>
+                            <artifactId>plugin</artifactId>
+                            <version>4.88</version>
+                            <relativePath />
+                          </parent>
+                          <groupId>io.jenkins.plugins</groupId>
+                          <artifactId>empty</artifactId>
+                          <version>1.0.0-SNAPSHOT</version>
+                          <packaging>hpi</packaging>
+                          <name>Empty Plugin</name>
+                          <scm>
+                            <connection>scm:git:https://github.com/jenkinsci/empty-plugin.git</connection>
+                          </scm>
+                          <properties>
+                            <jenkins.version>2.452.4</jenkins.version>
+                          </properties>
+                          <repositories>
+                            <repository>
+                              <id>repo.jenkins-ci.org</id>
+                              <url>https://repo.jenkins-ci.org/public/</url>
+                            </repository>
+                          </repositories>
+                          <pluginRepositories>
+                            <pluginRepository>
+                              <id>repo.jenkins-ci.org</id>
+                              <url>https://repo.jenkins-ci.org/public/</url>
+                            </pluginRepository>
+                          </pluginRepositories>
+                        </project>
+                        """
+                                .formatted(Settings.getBomVersion())));
+    }
+
     @Test
     void upgradeToRecommendCoreVersionTestWithBaseline() {
         rewriteRun(