diff --git a/src/main/resources/META-INF/rewrite/java-version-25.yml b/src/main/resources/META-INF/rewrite/java-version-25.yml index 5dbabc0589..e364b9c4e9 100644 --- a/src/main/resources/META-INF/rewrite/java-version-25.yml +++ b/src/main/resources/META-INF/rewrite/java-version-25.yml @@ -203,6 +203,7 @@ recipeList: groupId: biz.aQute.bnd artifactId: bnd-maven-plugin newVersion: 7.4.0 + - org.openrewrite.github.SetupJavaAdoptOpenJDKToTemurin - org.openrewrite.github.SetupJavaUpgradeJavaVersion: minimumJavaMajorVersion: 25 - org.openrewrite.gradle.UpdateGradleWrapper: diff --git a/src/test/java/org/openrewrite/java/migrate/UpgradeToJava25Test.java b/src/test/java/org/openrewrite/java/migrate/UpgradeToJava25Test.java index 75109a0170..cc1a63da76 100644 --- a/src/test/java/org/openrewrite/java/migrate/UpgradeToJava25Test.java +++ b/src/test/java/org/openrewrite/java/migrate/UpgradeToJava25Test.java @@ -37,6 +37,34 @@ public void defaults(RecipeSpec spec) { spec.recipeFromResources("org.openrewrite.java.migrate.UpgradeToJava25"); } + @Test + void replacesRetiredAdoptDistributionForJava25() { + rewriteRun( + spec -> spec.recipeFromResources("org.openrewrite.java.migrate.UpgradePluginsForJava25"), + org.openrewrite.yaml.Assertions.yaml( + """ + jobs: + build: + steps: + - uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: adopt + """, + """ + jobs: + build: + steps: + - uses: actions/setup-java@v4 + with: + java-version: '25' + distribution: temurin + """, + spec -> spec.path(".github/workflows/build.yml") + ) + ); + } + @Test void upgradeBndForJava25() { rewriteRun(