Skip to content

Commit 23a993f

Browse files
committed
Prepare for Rewrite Boot 3.4 upgrade
1 parent 54beb6a commit 23a993f

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/PrefsInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public void initializeDefaultPreferences() {
5353
"org.openrewrite.java.testing.junit5.JUnit5BestPractices",
5454
"org.openrewrite.java.testing.junit5.JUnit4to5Migration",
5555
"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7",
56-
"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2",
5756
"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3",
57+
"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_4",
5858
"org.rewrite.java.security.*",
5959
"org.springframework.rewrite.test.*",
6060
"rewrite.test.*"

headless-services/commons/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>3.3.3</version>
16+
<version>3.4.0</version>
1717
<relativePath></relativePath>
1818
</parent>
1919

@@ -118,7 +118,7 @@
118118
<commons-codec-version>1.13</commons-codec-version>
119119

120120
<!-- Rewrite specific properties -->
121-
<rewrite-recipe-bom.version>2.21.1</rewrite-recipe-bom.version>
121+
<rewrite-recipe-bom.version>2.22.0</rewrite-recipe-bom.version>
122122
<gradle.version>8.11</gradle.version>
123123
<rewrite-gradle-tooling-model.version>2.7.0</rewrite-gradle-tooling-model.version>
124124
<jgit-version>6.9.0.202403050737-r</jgit-version>

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/BeanMethodNotPublicReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.eclipse.jdt.core.dom.Modifier;
2525
import org.eclipse.jdt.core.dom.NormalAnnotation;
2626
import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
27-
import org.openrewrite.java.spring.BeanMethodsNotPublic;
27+
import org.openrewrite.java.spring.framework.BeanMethodsNotPublic;
2828
import org.openrewrite.marker.Range;
2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/SpringBootUpgrade.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public class SpringBootUpgrade {
5151
versionsToRecipeId.put("3.1", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1");
5252
versionsToRecipeId.put("3.2", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2");
5353
versionsToRecipeId.put("3.3", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3");
54+
versionsToRecipeId.put("3.4", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_4");
5455
}
5556

5657
public SpringBootUpgrade(SimpleLanguageServer server, RewriteRecipeRepository recipeRepo, JavaProjectFinder projectFinder) {
@@ -105,7 +106,7 @@ private Recipe createUpgradeRecipe(Map<String, Recipe> recipes, Version version,
105106
if (version.getMajor() == targetVersion.getMajor() && version.getMinor() == targetVersion.getMinor()) {
106107
// patch version upgrade - treat as pom versions only upgrade
107108
recipe.getRecipeList().add(new UpgradeDependencyVersion("org.springframework.boot", "*", version.getMajor() + "." + version.getMinor() + ".x", null, null, null));
108-
recipe.getRecipeList().add(new UpgradeParentVersion("org.springframework.boot", "spring-boot-starter-parent", version.getMajor() + "." + version.getMinor() + ".x", null));
109+
recipe.getRecipeList().add(new UpgradeParentVersion("org.springframework.boot", "spring-boot-starter-parent", version.getMajor() + "." + version.getMinor() + ".x", null, null));
109110
} else /*if (version.getMajor() == targetVersion.getMajor())*/ {
110111
List<String> recipedIds = createRecipeIdsChain(version.getMajor(), version.getMinor() + 1, targetVersion.getMajor(), targetVersion.getMinor(), versionsToRecipeId);
111112
if (!recipedIds.isEmpty()) {

vscode-extensions/vscode-spring-boot/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,8 @@
442442
"org.openrewrite.java.testing.junit5.JUnit5BestPractices",
443443
"org.openrewrite.java.testing.junit5.JUnit4to5Migration",
444444
"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7",
445-
"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2",
446445
"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3",
446+
"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_4",
447447
"org.rewrite.java.security.*",
448448
"org.springframework.rewrite.test.*",
449449
"rewrite.test.*"

0 commit comments

Comments
 (0)