diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/commands/UpgradeToBoot3Handler.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/commands/UpgradeToBoot3Handler.java index 1b6c56c7c..515382705 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/commands/UpgradeToBoot3Handler.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/commands/UpgradeToBoot3Handler.java @@ -59,6 +59,7 @@ public class UpgradeToBoot3Handler extends AbstractHandler { .toArray(CompletableFuture[]::new)); } catch (Exception e) { Log.log(e); + throw new ExecutionException("Failed to perform Upgarde to Spring Boot 3", e); } } diff --git a/headless-services/commons/commons-rewrite/pom.xml b/headless-services/commons/commons-rewrite/pom.xml new file mode 100644 index 000000000..b8caf2ad9 --- /dev/null +++ b/headless-services/commons/commons-rewrite/pom.xml @@ -0,0 +1,92 @@ + + 4.0.0 + commons-rewrite + + + org.springframework.ide.vscode + commons-parent + 1.34.0-SNAPSHOT + ../pom.xml + + + + + org.springframework.ide.vscode + commons-util + ${project.version} + + + org.springframework.ide.vscode + commons-language-server + ${project.version} + + + + org.openrewrite + rewrite-properties + ${rewrite-version} + + + org.openrewrite + rewrite-maven + ${rewrite-version} + + + org.openrewrite + rewrite-yaml + ${rewrite-version} + + + org.openrewrite + rewrite-java + ${rewrite-version} + + + + com.fasterxml.jackson.core + jackson-core + ${rewrite-jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + 2.13.2.2 + + + com.fasterxml.jackson.core + jackson-annotations + ${rewrite-jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${rewrite-jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${rewrite-jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${rewrite-jackson.version} + + + + org.openrewrite.recipe + rewrite-spring + ${rewrite-spring-version} + + + + org.openrewrite + rewrite-java-11 + ${rewrite-version} + + + + + \ No newline at end of file diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/JGitUtils.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/JGitUtils.java similarity index 88% rename from headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/JGitUtils.java rename to headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/JGitUtils.java index 189d918ae..6e2ecbffe 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/JGitUtils.java +++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/JGitUtils.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.boot.java.utils; +package org.springframework.ide.vscode.commons.rewrite; import java.nio.charset.StandardCharsets; @@ -7,7 +7,7 @@ import org.openrewrite.shaded.jgit.diff.HistogramDiff; import org.openrewrite.shaded.jgit.diff.RawText; import org.openrewrite.shaded.jgit.diff.RawTextComparator; -public class JGitUtils { +class JGitUtils { public static EditList getDiff(String txt1, String txt2) { RawText rt1 = new RawText(txt1.getBytes(StandardCharsets.UTF_8)); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/ORDocUtils.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/ORDocUtils.java similarity index 98% rename from headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/ORDocUtils.java rename to headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/ORDocUtils.java index 899f0d600..18653fe3b 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/ORDocUtils.java +++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/ORDocUtils.java @@ -8,7 +8,7 @@ * Contributors: * VMware, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.rewrite; +package org.springframework.ide.vscode.commons.rewrite; import java.nio.file.Path; import java.util.ArrayList; @@ -29,7 +29,6 @@ import org.openrewrite.shaded.jgit.diff.Edit; import org.openrewrite.shaded.jgit.diff.EditList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.ide.vscode.boot.java.utils.JGitUtils; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.util.BadLocationException; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/rewrite/java/ConvertAutowiredParameterIntoConstructorParameter.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ConvertAutowiredParameterIntoConstructorParameter.java similarity index 95% rename from headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/rewrite/java/ConvertAutowiredParameterIntoConstructorParameter.java rename to headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ConvertAutowiredParameterIntoConstructorParameter.java index 95b0c4dd7..fa29fe7eb 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/rewrite/java/ConvertAutowiredParameterIntoConstructorParameter.java +++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ConvertAutowiredParameterIntoConstructorParameter.java @@ -8,7 +8,7 @@ * Contributors: * VMware, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.rewrite.java; +package org.springframework.ide.vscode.commons.rewrite.java; import java.util.List; import java.util.Objects; @@ -35,10 +35,10 @@ import org.openrewrite.java.tree.JavaType.FullyQualified; import org.openrewrite.java.tree.Statement; import org.openrewrite.java.tree.TypeTree; import org.openrewrite.java.tree.TypeUtils; -import org.springframework.ide.vscode.boot.java.Annotations; -import org.springframework.ide.vscode.boot.java.rewrite.ORAstUtils; public class ConvertAutowiredParameterIntoConstructorParameter extends Recipe { + + private static final String AUTOWIRED = "org.springframework.beans.factory.annotation.Autowired"; private String classFqName; private String fieldName; @@ -74,7 +74,7 @@ public class ConvertAutowiredParameterIntoConstructorParameter extends Recipe { && multiVariable.getVariables().size() == 1 && fieldName.equals(multiVariable.getVariables().get(0).getName().printTrimmed())) { - mv = (VariableDeclarations) new RemoveAnnotationVisitor(new AnnotationMatcher("@" + Annotations.AUTOWIRED)).visit(multiVariable, p); + mv = (VariableDeclarations) new RemoveAnnotationVisitor(new AnnotationMatcher("@" + AUTOWIRED)).visit(multiVariable, p); doAfterVisit(new AddContructorParameterVisitor(classFqName, fieldName, multiVariable.getTypeExpression())); } return mv; @@ -108,7 +108,7 @@ public class ConvertAutowiredParameterIntoConstructorParameter extends Recipe { .map(a -> TypeUtils.asFullyQualified(a.getType())) .filter(Objects::nonNull) .map(fq -> fq.getFullyQualifiedName()) - .filter(fqn -> Annotations.AUTOWIRED.equals(fqn)) + .filter(fqn -> AUTOWIRED.equals(fqn)) .findFirst() .isPresent() ) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/ORAstUtils.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java similarity index 99% rename from headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/ORAstUtils.java rename to headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java index 2773d15ac..202dfd6da 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/ORAstUtils.java +++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java @@ -8,7 +8,7 @@ * Contributors: * VMware, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.rewrite; +package org.springframework.ide.vscode.commons.rewrite.java; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/rewrite/maven/ChangeDependencyClassifier.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/maven/ChangeDependencyClassifier.java similarity index 98% rename from headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/rewrite/maven/ChangeDependencyClassifier.java rename to headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/maven/ChangeDependencyClassifier.java index 3446bcba1..60f1258ee 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/rewrite/maven/ChangeDependencyClassifier.java +++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/maven/ChangeDependencyClassifier.java @@ -8,7 +8,7 @@ * Contributors: * VMware, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.rewrite.maven; +package org.springframework.ide.vscode.commons.rewrite.maven; import java.util.Objects; import java.util.Optional; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/MavenProjectParser.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/maven/MavenProjectParser.java similarity index 99% rename from headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/MavenProjectParser.java rename to headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/maven/MavenProjectParser.java index 671c4966b..6892e7b13 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/MavenProjectParser.java +++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/maven/MavenProjectParser.java @@ -8,7 +8,7 @@ * Contributors: * VMware, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.rewrite; +package org.springframework.ide.vscode.commons.rewrite.maven; import static org.openrewrite.Tree.randomId; diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml index 5e14fd480..adcb5ad7d 100644 --- a/headless-services/commons/pom.xml +++ b/headless-services/commons/pom.xml @@ -29,6 +29,7 @@ commons-cf commons-maven commons-gradle + commons-rewrite language-server-starter diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml index 82ed94465..901a7f111 100644 --- a/headless-services/spring-boot-language-server/pom.xml +++ b/headless-services/spring-boot-language-server/pom.xml @@ -99,74 +99,17 @@ commons-language-server ${dependencies.version} + + org.springframework.ide.vscode + commons-rewrite + ${dependencies.version} + org.eclipse.jdt org.eclipse.jdt.core ${jdt.core.version} - - org.openrewrite - rewrite-properties - ${rewrite-version} - - - org.openrewrite - rewrite-maven - ${rewrite-version} - - - org.openrewrite - rewrite-yaml - ${rewrite-version} - - - org.openrewrite - rewrite-java - ${rewrite-version} - - - com.fasterxml.jackson.core - jackson-core - ${rewrite-jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - 2.13.2.2 - - - com.fasterxml.jackson.core - jackson-annotations - ${rewrite-jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${rewrite-jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${rewrite-jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${rewrite-jackson.version} - - - - org.openrewrite.recipe - rewrite-spring - ${rewrite-spring-version} - - - - org.openrewrite - rewrite-java-11 - ${rewrite-version} - commons-io commons-io @@ -197,7 +140,40 @@ - + + + + com.fasterxml.jackson.core + jackson-core + ${rewrite-jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + 2.13.2.2 + + + com.fasterxml.jackson.core + jackson-annotations + ${rewrite-jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${rewrite-jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${rewrite-jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${rewrite-jackson.version} + + + org.springframework.boot diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/ORCompilationUnitCache.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/ORCompilationUnitCache.java index e49a3066f..8d3b0cfba 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/ORCompilationUnitCache.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/ORCompilationUnitCache.java @@ -45,6 +45,7 @@ import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFin import org.springframework.ide.vscode.commons.languageserver.java.ProjectObserver; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; +import org.springframework.ide.vscode.commons.rewrite.java.ORAstUtils; import org.springframework.ide.vscode.commons.util.text.TextDocument; import com.google.common.cache.Cache; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepository.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepository.java index 5baf03f57..eef2e2f89 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepository.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepository.java @@ -48,6 +48,8 @@ import org.springframework.ide.vscode.commons.java.IClasspathUtil; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; +import org.springframework.ide.vscode.commons.rewrite.ORDocUtils; +import org.springframework.ide.vscode.commons.rewrite.maven.MavenProjectParser; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/AbstractRewriteJavaCodeAction.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/AbstractRewriteJavaCodeAction.java index ae04958fe..484bce2b8 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/AbstractRewriteJavaCodeAction.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/AbstractRewriteJavaCodeAction.java @@ -34,12 +34,12 @@ import org.openrewrite.Result; import org.openrewrite.java.tree.J; import org.springframework.ide.vscode.boot.java.handlers.JavaCodeAction; import org.springframework.ide.vscode.boot.java.rewrite.ORCompilationUnitCache; -import org.springframework.ide.vscode.boot.java.rewrite.ORDocUtils; import org.springframework.ide.vscode.boot.java.rewrite.RewriteRefactorings; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.util.LspClient; import org.springframework.ide.vscode.commons.languageserver.util.LspClient.Client; +import org.springframework.ide.vscode.commons.rewrite.ORDocUtils; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.util.text.IRegion; import org.springframework.ide.vscode.commons.util.text.LanguageId; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/ConvertAutowiredField.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/ConvertAutowiredField.java index 32ca72e1a..7d691f32f 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/ConvertAutowiredField.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/ConvertAutowiredField.java @@ -32,10 +32,10 @@ import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.springframework.ide.vscode.boot.java.Annotations; import org.springframework.ide.vscode.boot.java.rewrite.ORCompilationUnitCache; import org.springframework.ide.vscode.boot.java.rewrite.RewriteRefactorings; -import org.springframework.ide.vscode.boot.rewrite.java.ConvertAutowiredParameterIntoConstructorParameter; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; +import org.springframework.ide.vscode.commons.rewrite.java.ConvertAutowiredParameterIntoConstructorParameter; import org.springframework.ide.vscode.commons.util.text.IRegion; import org.springframework.ide.vscode.commons.util.text.TextDocument; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/NoRequestMapping.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/NoRequestMapping.java index 0464f3aab..ede144041 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/NoRequestMapping.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/codeaction/NoRequestMapping.java @@ -29,12 +29,12 @@ import org.eclipse.lsp4j.WorkspaceEdit; import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.openrewrite.java.MethodMatcher; import org.openrewrite.java.spring.NoRequestMappingAnnotation; -import org.springframework.ide.vscode.boot.java.rewrite.ORAstUtils; import org.springframework.ide.vscode.boot.java.rewrite.ORCompilationUnitCache; import org.springframework.ide.vscode.boot.java.rewrite.RewriteRefactorings; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; +import org.springframework.ide.vscode.commons.rewrite.java.ORAstUtils; import org.springframework.ide.vscode.commons.util.text.IRegion; import org.springframework.ide.vscode.commons.util.text.TextDocument; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/quickfix/RewriteQuickFixHandler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/quickfix/RewriteQuickFixHandler.java index fb43f0119..5655b86bc 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/quickfix/RewriteQuickFixHandler.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/quickfix/RewriteQuickFixHandler.java @@ -23,12 +23,12 @@ import org.openrewrite.Recipe; import org.openrewrite.Result; import org.openrewrite.java.JavaVisitor; import org.openrewrite.java.tree.J; -import org.springframework.ide.vscode.boot.java.rewrite.ORAstUtils; import org.springframework.ide.vscode.boot.java.rewrite.ORCompilationUnitCache; -import org.springframework.ide.vscode.boot.java.rewrite.ORDocUtils; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.quickfix.QuickfixEdit; import org.springframework.ide.vscode.commons.languageserver.quickfix.QuickfixHandler; +import org.springframework.ide.vscode.commons.rewrite.ORDocUtils; +import org.springframework.ide.vscode.commons.rewrite.java.ORAstUtils; import org.springframework.ide.vscode.commons.util.text.TextDocument; import com.google.gson.Gson; diff --git a/headless-services/spring-boot-language-server/src/main/resources/META-INF/rewrite/spring-boot3-upgrade.yml b/headless-services/spring-boot-language-server/src/main/resources/META-INF/rewrite/spring-boot3-upgrade.yml deleted file mode 100644 index 1fda34ef4..000000000 --- a/headless-services/spring-boot-language-server/src/main/resources/META-INF/rewrite/spring-boot3-upgrade.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -######################################################################################################################## -# SpringBoot 3_0 -type: specs.openrewrite.org/v1beta/recipe -name: org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0 -displayName: Upgrade to Spring Boot 3.0 from 2.x -description: 'Upgrade to Spring Boot 3.0 from prior 2.x version.' -recipeList: - # Upgrade 3.0.x from 2.x - - org.openrewrite.maven.UpgradeDependencyVersion: - groupId: org.springframework.boot - artifactId: "*" - newVersion: 3.0.0-SNAPSHOT - trustParent: true - - org.openrewrite.maven.UpgradeParentVersion: - groupId: org.springframework.boot - artifactId: spring-boot-starter-parent - newVersion: 3.0.0-SNAPSHOT - - org.openrewrite.maven.ChangePropertyValue: - key: 'java.version' - newValue: 17 - addIfMissing: true - - - org.openrewrite.java.spring.data.UpgradeSpringData_3_0 - \ No newline at end of file diff --git a/headless-services/spring-boot-language-server/src/main/resources/META-INF/rewrite/spring-data3-upgrade.yml b/headless-services/spring-boot-language-server/src/main/resources/META-INF/rewrite/spring-data3-upgrade.yml deleted file mode 100644 index 4218bca96..000000000 --- a/headless-services/spring-boot-language-server/src/main/resources/META-INF/rewrite/spring-data3-upgrade.yml +++ /dev/null @@ -1,24 +0,0 @@ -######################################################################################################################## -# Spring Data 3.0 -type: specs.openrewrite.org/v1beta/recipe -name: org.openrewrite.java.spring.data.UpgradeSpringData_3_0 -displayName: Upgrade to Spring Data 3.0 -description: 'Upgrade to Spring Data to 3.0 from any prior version.' -recipeList: - - org.springframework.ide.vscode.boot.rewrite.maven.ChangeDependencyClassifier: - groupId: org.ehcache - artifactId: ehcache - newClassifier: jakarta - - org.openrewrite.java.ChangePackage: - oldPackageName: javax.persistence - newPackageName: jakarta.persistence - recursive: true - - org.openrewrite.java.ChangePackage: - oldPackageName: javax.validation - newPackageName: jakarta.validation - recursive: true - - org.openrewrite.java.ChangePackage: - oldPackageName: javax.xml.bind - newPackageName: jakarta.xml.bind - recursive: true - \ No newline at end of file