Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/main/java/io/moderne/devcenter/JavaVersionUpgrade.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ public J preVisit(J tree, ExecutionContext ctx) {
Measure measure = Measure.Completed;
int actualVersion = javaVersion.getMajorVersion();
if (actualVersion < majorVersion) {
if (actualVersion >= 21) {
if (actualVersion >= 25) {
measure = Measure.Java25Plus;
} else if (actualVersion >= 21) {
measure = Measure.Java21Plus;
} else if (actualVersion >= 17) {
measure = Measure.Java17Plus;
Expand Down Expand Up @@ -114,6 +116,7 @@ public enum Measure implements DevCenterMeasure {
Java11Plus("Java 11+", "Java 11 and later", 11),
Java17Plus("Java 17+", "Java 17 and later", 17),
Java21Plus("Java 21+", "Java 21 and later", 21),
Java25Plus("Java 25+", "Java 25 and later", 25),
Completed("Completed", "The upgrade to the desired Java version is already complete.", 0);

private final @Language("markdown") String name;
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/rewrite/devcenter-starter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ recipeList:
version: 3.5.0
upgradeRecipe: io.moderne.java.spring.boot3.UpgradeSpringBoot_3_5
- io.moderne.devcenter.JavaVersionUpgrade:
majorVersion: 21
upgradeRecipe: org.openrewrite.java.migrate.UpgradeToJava21
majorVersion: 25
upgradeRecipe: org.openrewrite.java.migrate.UpgradeToJava25
- io.moderne.devcenter.JUnitJupiterUpgrade:
upgradeRecipe: org.openrewrite.java.testing.junit5.JUnit4to5Migration
- io.moderne.devcenter.SecurityStarter
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/rewrite/quarkus-devcenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ recipeList:
version: 3.26.x
upgradeRecipe: io.moderne.devcenter.UpgradeQuarkusUniverseBom
- io.moderne.devcenter.JavaVersionUpgrade:
majorVersion: 21
upgradeRecipe: org.openrewrite.java.migrate.UpgradeToJava21
majorVersion: 25
upgradeRecipe: org.openrewrite.java.migrate.UpgradeToJava25
- io.moderne.devcenter.SecurityStarter
---
type: specs.openrewrite.org/v1beta/recipe
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/moderne/devcenter/DevCenterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ void twoUpgradeCardsFromOneRepository() {
.dataTable(UpgradesAndMigrations.Row.class, rows ->
assertThat(rows).containsExactlyInAnyOrder(
new UpgradesAndMigrations.Row(
"Move to Java 21", Java8Plus.ordinal(), Java8Plus.getName(), "8"),
"Move to Java 25", Java8Plus.ordinal(), Java8Plus.getName(), "8"),
new UpgradesAndMigrations.Row("Move to JUnit 5",
JUnit4.ordinal(), "JUnit 4", "JUnit 4")
)),
Expand Down