From 61d6d1ded07f079dae7c1eedf42fa2a1fba29a2c Mon Sep 17 00:00:00 2001 From: aboyko Date: Mon, 28 Nov 2022 17:19:37 -0500 Subject: [PATCH] Adopt Rewrite Boot 3 upgrade --- .../tooling/boot/ls/PrefsInitializer.java | 2 +- .../META-INF/rewrite/upgrade-boot3.yml | 30 +++++++++---------- .../boot/java/rewrite/SpringBootUpgrade.java | 2 +- .../vscode-spring-boot/package.json | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/PrefsInitializer.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/PrefsInitializer.java index 859e8b20a..c4f7fb6bf 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/PrefsInitializer.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/PrefsInitializer.java @@ -55,7 +55,7 @@ public class PrefsInitializer extends AbstractPreferenceInitializer { "org.openrewrite.java.testing.junit5.JUnit4to5Migration", "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_6", "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7", - "org.springframework.sts.java.spring.boot3.UpgradeSpringBoot_3_0", + "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0", "org.rewrite.java.security.*", "org.springframework.rewrite.test.*", "rewrite.test.*" diff --git a/headless-services/commons/commons-rewrite/src/main/resources/META-INF/rewrite/upgrade-boot3.yml b/headless-services/commons/commons-rewrite/src/main/resources/META-INF/rewrite/upgrade-boot3.yml index fa60fab8b..517ff400a 100644 --- a/headless-services/commons/commons-rewrite/src/main/resources/META-INF/rewrite/upgrade-boot3.yml +++ b/headless-services/commons/commons-rewrite/src/main/resources/META-INF/rewrite/upgrade-boot3.yml @@ -16,18 +16,18 @@ --- ######################################################################################################################## # SpringBoot 3_0 -type: specs.openrewrite.org/v1beta/recipe -name: org.springframework.sts.java.spring.boot3.UpgradeSpringBoot_3_0 -displayName: Upgrade to Spring Boot 3.0 from 2.7 -description: 'Upgrade to Spring Boot 3.0 from prior 2.x version.' -recipeList: - - org.openrewrite.maven.AddRepository: - id: spring-snapshots - url: https://repo.spring.io/snapshot - snapshotsEnabled: true - - org.openrewrite.maven.AddRepository: - id: spring-milestones - url: https://repo.spring.io/milestone - snapshotsEnabled: false - - org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0 ---- +#type: specs.openrewrite.org/v1beta/recipe +#name: org.springframework.sts.java.spring.boot3.UpgradeSpringBoot_3_0 +#displayName: Upgrade to Spring Boot 3.0 from 2.7 +#description: 'Upgrade to Spring Boot 3.0 from prior 2.x version.' +#recipeList: +# - org.openrewrite.maven.AddRepository: +# id: spring-snapshots +# url: https://repo.spring.io/snapshot +# snapshotsEnabled: true +# - org.openrewrite.maven.AddRepository: +# id: spring-milestones +# url: https://repo.spring.io/milestone +# snapshotsEnabled: false +# - org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0 +#--- 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 ed2590302..f7fbbb2d3 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 @@ -43,7 +43,7 @@ public class SpringBootUpgrade { "2.5", "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_5", "2.6", "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_6", "2.7", "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7", - "3.0", "org.springframework.sts.java.spring.boot3.UpgradeSpringBoot_3_0" + "3.0", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0" ); private RewriteRecipeRepository recipeRepo; diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json index e0ef339ce..7717b4f31 100644 --- a/vscode-extensions/vscode-spring-boot/package.json +++ b/vscode-extensions/vscode-spring-boot/package.json @@ -232,7 +232,7 @@ "org.openrewrite.java.testing.junit5.JUnit4to5Migration", "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_6", "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7", - "org.springframework.sts.java.spring.boot3.UpgradeSpringBoot_3_0", + "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0", "org.rewrite.java.security.*", "org.springframework.rewrite.test.*", "rewrite.test.*"