diff --git a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java index b8f0ea620..d65f2707a 100644 --- a/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java +++ b/headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java @@ -69,7 +69,7 @@ public class GradleIJavaProjectParser extends AbstractJavaProjectParser { @Override protected List 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()); diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml index 534da5b6c..d51578543 100644 --- a/headless-services/commons/pom.xml +++ b/headless-services/commons/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.2 + 3.2.3 @@ -118,10 +118,10 @@ 1.9.20 - 8.15.2 - 1.11.3 - 5.4.0 - 1.5.1 + 8.19.0 + 1.11.4 + 5.5.0 + 2.0.0 8.5 6.1.1 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 defd45cf1..c24360197 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 @@ -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); }