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

Boot upgrade closest minor version can't be below current version

Browse Source
This commit is contained in:
aboyko
2023-06-05 12:14:58 -04:00
parent 0274a64800
commit b59b6123dd
4 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +58,7 @@ public class PrefsInitializer extends AbstractPreferenceInitializer {
"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_6",
"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7",
"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0",
"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1",
"org.rewrite.java.security.*",
"org.springframework.rewrite.test.*",
"rewrite.test.*"

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

@@ -46,7 +46,8 @@ 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.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0"
"3.0", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0"/*,
"3.1", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1"*/
);
private RewriteRecipeRepository recipeRepo;

5
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/validation/generations/UpdateBootVersion.java
View File

@@ -24,6 +24,7 @@ import org.eclipse.lsp4j.ShowDocumentParams;
import org.springframework.ide.vscode.boot.java.rewrite.SpringBootUpgrade;
import org.springframework.ide.vscode.boot.validation.generations.preferences.VersionValidationProblemType;
import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.java.SpringProjectUtil;
import org.springframework.ide.vscode.commons.java.Version;
import org.springframework.ide.vscode.commons.languageserver.reconcile.DiagnosticSeverityProvider;
@@ -92,6 +93,10 @@ public class UpdateBootVersion extends AbstractDiagnosticValidator {
List<CodeAction> actions = new ArrayList<>(2);
bootUpgradeOpt.flatMap(bu -> bu.getNearestAvailableMinorVersion(latest)).map(targetVersion -> {
Version upgradeVersion = SpringProjectUtil.getVersion(targetVersion);
if (javaProjectVersion.compareTo(upgradeVersion) >= 0) {
return null;
}
CodeAction c = new CodeAction();
c.setKind(CodeActionKind.QuickFix);
c.setTitle("Upgrade to Spring Boot " + targetVersion + " (executes the full project conversion recipe from OpenRewrite)");

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

@@ -249,6 +249,7 @@
"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_6",
"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7",
"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0",
"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1",
"org.rewrite.java.security.*",
"org.springframework.rewrite.test.*",
"rewrite.test.*"