From c5764edb69211399de419b6fe4484c45316e70a1 Mon Sep 17 00:00:00 2001
From: aboyko <alex.boyko@broadcom.com>
Date: Thu, 23 May 2024 17:58:53 -0400
Subject: [PATCH] Update to the latest OR and Boot versions

---
 .../tooling/boot/ls/prefs/PrefsInitializer.java        |  1 +
 headless-services/commons/pom.xml                      | 10 +++++-----
 .../vscode/boot/java/rewrite/SpringBootUpgrade.java    |  1 +
 .../boot/java/rewrite/RewriteRecipeRepositoryTest.java |  4 ++--
 vscode-extensions/vscode-spring-boot/package.json      |  1 +
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/PrefsInitializer.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/PrefsInitializer.java
index 91d93b18e..de2523f4e 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/PrefsInitializer.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/PrefsInitializer.java
@@ -55,6 +55,7 @@ public class PrefsInitializer extends AbstractPreferenceInitializer {
 				"org.openrewrite.java.testing.junit5.JUnit4to5Migration",
 				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7",
 				"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2",
+				"org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3",
 				"org.rewrite.java.security.*",
 				"org.springframework.rewrite.test.*",
 				"rewrite.test.*"
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index a942ae402..d7ae18fd3 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.5</version>
+		<version>3.3.0</version>
 		<relativePath></relativePath>
 	</parent>
 
@@ -119,10 +119,10 @@
 		<kotlin.version>1.9.20</kotlin.version>
 
 		<!-- Rewrite specific properties -->
-		<rewrite-version>8.24.0</rewrite-version>
-		<rewrite-kotlin-version>1.14.0</rewrite-kotlin-version>
-		<rewrite-spring-version>5.8.0</rewrite-spring-version>
-		<rewrite-gradle-tooling-api-version>2.2.0</rewrite-gradle-tooling-api-version>
+		<rewrite-version>8.27.1</rewrite-version>
+		<rewrite-kotlin-version>1.16.2</rewrite-kotlin-version>
+		<rewrite-spring-version>5.11.0</rewrite-spring-version>
+		<rewrite-gradle-tooling-api-version>2.3.0</rewrite-gradle-tooling-api-version>
 		<jgit-version>6.9.0.202403050737-r</jgit-version>
 		
 		<gradle-tooling.version>8.5</gradle-tooling.version>
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/SpringBootUpgrade.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/SpringBootUpgrade.java
index fa0d7f842..c6151ef81 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/SpringBootUpgrade.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/SpringBootUpgrade.java
@@ -50,6 +50,7 @@ public class SpringBootUpgrade {
 		versionsToRecipeId.put("3.0", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0");
 		versionsToRecipeId.put("3.1", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1");
 		versionsToRecipeId.put("3.2", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2");
+		versionsToRecipeId.put("3.3", "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3");
 	}
 	
 	public SpringBootUpgrade(SimpleLanguageServer server, RewriteRecipeRepository recipeRepo, JavaProjectFinder projectFinder) {
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepositoryTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepositoryTest.java
index 4f0be6cd3..ecdcf89f5 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepositoryTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepositoryTest.java
@@ -126,8 +126,8 @@ public class RewriteRecipeRepositoryTest {
 		assertThat(java17.getRecipeList().size()).isEqualTo(3);
 		
 		assertThat(java17.getRecipeList().get(0).getName()).isEqualTo("org.openrewrite.java.migrate.Java8toJava11");
-		assertThat(java17.getRecipeList().get(1).getName()).isEqualTo("org.openrewrite.java.migrate.JavaVersion17");
-		assertThat(java17.getRecipeList().get(2).getName()).isEqualTo("org.openrewrite.java.migrate.lang.UseTextBlocks");
+		assertThat(java17.getRecipeList().get(1).getName()).isEqualTo("org.openrewrite.java.migrate.UpgradeBuildToJava17");
+		assertThat(java17.getRecipeList().get(2).getName()).isEqualTo("org.openrewrite.java.migrate.RemovedModifierAndConstantBootstrapsConstructors");
 		
 	}
 
diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json
index b033642e1..4ec2209fa 100644
--- a/vscode-extensions/vscode-spring-boot/package.json
+++ b/vscode-extensions/vscode-spring-boot/package.json
@@ -395,6 +395,7 @@
               "org.openrewrite.java.testing.junit5.JUnit4to5Migration",
               "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7",
               "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2",
+              "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3",
               "org.rewrite.java.security.*",
               "org.springframework.rewrite.test.*",
               "rewrite.test.*"