Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prepare for Rewrite Boot 3.4 upgrade

Browse Source
This commit is contained in:
aboyko
2024-11-25 15:08:50 -05:00
parent 54beb6afc4
commit 23a993f3e5
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.*"

4
headless-services/commons/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.0</version>
<relativePath></relativePath>
</parent>
@@ -118,7 +118,7 @@
<commons-codec-version>1.13</commons-codec-version>
<!-- Rewrite specific properties -->
<rewrite-recipe-bom.version>2.21.1</rewrite-recipe-bom.version>
<rewrite-recipe-bom.version>2.22.0</rewrite-recipe-bom.version>
<gradle.version>8.11</gradle.version>
<rewrite-gradle-tooling-model.version>2.7.0</rewrite-gradle-tooling-model.version>
<jgit-version>6.9.0.202403050737-r</jgit-version>

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

@@ -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;

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

@@ -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<String> recipedIds = createRecipeIdsChain(version.getMajor(), version.getMinor() + 1, targetVersion.getMajor(), targetVersion.getMinor(), versionsToRecipeId);
if (!recipedIds.isEmpty()) {

2
vscode-extensions/vscode-spring-boot/package.json
View File

@@ -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.*"