Skip to content

Commit 1abd3e6

Browse files
committed
Upgrade Boot and Rewrite dependencies
1 parent c0c53e7 commit 1abd3e6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected List<Marker> getJavaProvenance(SourceFile buildFileAst, Path projectDi
6969
@Override
7070
protected List<? extends SourceFile> parseBuildFiles(Path projectDir, ExecutionContext ctx) {
7171
OpenRewriteModel openRewriteGradleModel = OpenRewriteModelBuilder.forProjectDirectory(projectDir.toFile(), Paths.get(jp.getProjectBuild().getBuildFile()).toFile());
72-
GradleProject gradleProject = GradleProject.fromToolingModel(openRewriteGradleModel.gradleProject());
72+
GradleProject gradleProject = org.openrewrite.gradle.toolingapi.GradleProject.toMarker(openRewriteGradleModel.gradleProject());
7373
GradleParser gradleParser = GradleParser.builder().groovyParser(GroovyParser.builder()).build();
7474

7575
Path buildFilePath = Paths.get(jp.getProjectBuild().getBuildFile());

headless-services/commons/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>3.2.2</version>
16+
<version>3.2.3</version>
1717
<relativePath></relativePath>
1818
</parent>
1919

@@ -118,10 +118,10 @@
118118
<kotlin.version>1.9.20</kotlin.version>
119119

120120
<!-- Rewrite specific properties -->
121-
<rewrite-version>8.15.2</rewrite-version>
122-
<rewrite-kotlin-version>1.11.3</rewrite-kotlin-version>
123-
<rewrite-spring-version>5.4.0</rewrite-spring-version>
124-
<rewrite-gradle-tooling-api-version>1.5.1</rewrite-gradle-tooling-api-version>
121+
<rewrite-version>8.19.0</rewrite-version>
122+
<rewrite-kotlin-version>1.11.4</rewrite-kotlin-version>
123+
<rewrite-spring-version>5.5.0</rewrite-spring-version>
124+
<rewrite-gradle-tooling-api-version>2.0.0</rewrite-gradle-tooling-api-version>
125125

126126
<gradle-tooling.version>8.5</gradle-tooling.version>
127127
<gradle-core.version>6.1.1</gradle-core.version>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private synchronized Map<String, Recipe> loadRecipes() {
172172
recipes.put(r.getName(), r);
173173
// HACK: add Jakarta XML Bind migration recipe again as there are cases when maven dependency isn't added
174174
if (r.getName().startsWith("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_")) {
175-
AddDependency addDepXmlBindDep = new AddDependency("jakarta.xml.bind", "jakarta.xml.bind-api", "latest.release", null, null, null, "javax.xml.bind..*", null, null, null, null, true);
175+
AddDependency addDepXmlBindDep = new AddDependency("jakarta.xml.bind", "jakarta.xml.bind-api", "latest.release", null, null, null, "javax.xml.bind..*", null, null, null, null, false);
176176
r.getDescriptor().getRecipeList().add(addDepXmlBindDep.getDescriptor());
177177
r.getRecipeList().add(addDepXmlBindDep);
178178
}

0 commit comments

Comments
 (0)