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

Upgrade Boot and Rewrite dependencies

Browse Source
This commit is contained in:
aboyko
2024-03-05 23:11:16 -05:00
parent c0c53e7f9b
commit 1abd3e6dd2
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java
View File

@@ -69,7 +69,7 @@ public class GradleIJavaProjectParser extends AbstractJavaProjectParser {
@Override
protected List<? extends SourceFile> parseBuildFiles(Path projectDir, ExecutionContext ctx) {
OpenRewriteModel openRewriteGradleModel = OpenRewriteModelBuilder.forProjectDirectory(projectDir.toFile(), Paths.get(jp.getProjectBuild().getBuildFile()).toFile());
GradleProject gradleProject = GradleProject.fromToolingModel(openRewriteGradleModel.gradleProject());
GradleProject gradleProject = org.openrewrite.gradle.toolingapi.GradleProject.toMarker(openRewriteGradleModel.gradleProject());
GradleParser gradleParser = GradleParser.builder().groovyParser(GroovyParser.builder()).build();
Path buildFilePath = Paths.get(jp.getProjectBuild().getBuildFile());

10
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.2.2</version>
<version>3.2.3</version>
<relativePath></relativePath>
</parent>
@@ -118,10 +118,10 @@
<kotlin.version>1.9.20</kotlin.version>
<!-- Rewrite specific properties -->
<rewrite-version>8.15.2</rewrite-version>
<rewrite-kotlin-version>1.11.3</rewrite-kotlin-version>
<rewrite-spring-version>5.4.0</rewrite-spring-version>
<rewrite-gradle-tooling-api-version>1.5.1</rewrite-gradle-tooling-api-version>
<rewrite-version>8.19.0</rewrite-version>
<rewrite-kotlin-version>1.11.4</rewrite-kotlin-version>
<rewrite-spring-version>5.5.0</rewrite-spring-version>
<rewrite-gradle-tooling-api-version>2.0.0</rewrite-gradle-tooling-api-version>
<gradle-tooling.version>8.5</gradle-tooling.version>
<gradle-core.version>6.1.1</gradle-core.version>

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

@@ -172,7 +172,7 @@ public class RewriteRecipeRepository {
recipes.put(r.getName(), r);
// HACK: add Jakarta XML Bind migration recipe again as there are cases when maven dependency isn't added
if (r.getName().startsWith("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_")) {
AddDependency addDepXmlBindDep = new AddDependency("jakarta.xml.bind", "jakarta.xml.bind-api", "latest.release", null, null, null, "javax.xml.bind..*", null, null, null, null, true);
AddDependency addDepXmlBindDep = new AddDependency("jakarta.xml.bind", "jakarta.xml.bind-api", "latest.release", null, null, null, "javax.xml.bind..*", null, null, null, null, false);
r.getDescriptor().getRecipeList().add(addDepXmlBindDep.getDescriptor());
r.getRecipeList().add(addDepXmlBindDep);
}