From 23a993f3e588ac1ee800c9e3f01b6c32c2b240d5 Mon Sep 17 00:00:00 2001 From: aboyko Date: Mon, 25 Nov 2024 15:08:50 -0500 Subject: [PATCH] Prepare for Rewrite Boot 3.4 upgrade --- .../tooling/boot/ls/prefs/PrefsInitializer.java | 2 +- headless-services/commons/pom.xml | 4 ++-- .../boot/java/reconcilers/BeanMethodNotPublicReconciler.java | 2 +- .../ide/vscode/boot/java/rewrite/SpringBootUpgrade.java | 3 ++- vscode-extensions/vscode-spring-boot/package.json | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/PrefsInitializer.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/PrefsInitializer.java index f09f9c9d7..de1fc9292 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/PrefsInitializer.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/PrefsInitializer.java @@ -53,8 +53,8 @@ public class PrefsInitializer extends AbstractPreferenceInitializer { "org.openrewrite.java.testing.junit5.JUnit5BestPractices", "org.openrewrite.java.testing.junit5.JUnit4to5Migration", "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7", - "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3", + "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_4", "org.rewrite.java.security.*", "org.springframework.rewrite.test.*", "rewrite.test.*" diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml index 2472fc7a0..9da583964 100644 --- a/headless-services/commons/pom.xml +++ b/headless-services/commons/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.0 @@ -118,7 +118,7 @@ 1.13 - 2.21.1 + 2.22.0 8.11 2.7.0 6.9.0.202403050737-r diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/BeanMethodNotPublicReconciler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/BeanMethodNotPublicReconciler.java index 2f2dd87c3..80b2313dd 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/BeanMethodNotPublicReconciler.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/BeanMethodNotPublicReconciler.java @@ -24,7 +24,7 @@ import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.Modifier; import org.eclipse.jdt.core.dom.NormalAnnotation; import org.eclipse.jdt.core.dom.SingleMemberAnnotation; -import org.openrewrite.java.spring.BeanMethodsNotPublic; +import org.openrewrite.java.spring.framework.BeanMethodsNotPublic; import org.openrewrite.marker.Range; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/SpringBootUpgrade.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/SpringBootUpgrade.java index c6151ef81..0be123c77 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/SpringBootUpgrade.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/SpringBootUpgrade.java @@ -51,6 +51,7 @@ public class SpringBootUpgrade { versionsToRecipeId.put("3.1", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1"); versionsToRecipeId.put("3.2", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2"); versionsToRecipeId.put("3.3", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3"); + versionsToRecipeId.put("3.4", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_4"); } public SpringBootUpgrade(SimpleLanguageServer server, RewriteRecipeRepository recipeRepo, JavaProjectFinder projectFinder) { @@ -105,7 +106,7 @@ public class SpringBootUpgrade { if (version.getMajor() == targetVersion.getMajor() && version.getMinor() == targetVersion.getMinor()) { // patch version upgrade - treat as pom versions only upgrade recipe.getRecipeList().add(new UpgradeDependencyVersion("org.springframework.boot", "*", version.getMajor() + "." + version.getMinor() + ".x", null, null, null)); - recipe.getRecipeList().add(new UpgradeParentVersion("org.springframework.boot", "spring-boot-starter-parent", version.getMajor() + "." + version.getMinor() + ".x", null)); + recipe.getRecipeList().add(new UpgradeParentVersion("org.springframework.boot", "spring-boot-starter-parent", version.getMajor() + "." + version.getMinor() + ".x", null, null)); } else /*if (version.getMajor() == targetVersion.getMajor())*/ { List recipedIds = createRecipeIdsChain(version.getMajor(), version.getMinor() + 1, targetVersion.getMajor(), targetVersion.getMinor(), versionsToRecipeId); if (!recipedIds.isEmpty()) { diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json index 02214094e..a07633637 100644 --- a/vscode-extensions/vscode-spring-boot/package.json +++ b/vscode-extensions/vscode-spring-boot/package.json @@ -442,8 +442,8 @@ "org.openrewrite.java.testing.junit5.JUnit5BestPractices", "org.openrewrite.java.testing.junit5.JUnit4to5Migration", "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7", - "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3", + "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_4", "org.rewrite.java.security.*", "org.springframework.rewrite.test.*", "rewrite.test.*"