From 42eca4fed995bb83bccc496e120b2099fc407e7b Mon Sep 17 00:00:00 2001
From: aboyko <alex.boyko@broadcom.com>
Date: Thu, 22 Aug 2024 15:52:46 -0400
Subject: [PATCH] Bump up to the latest OR and Boot

---
 headless-services/commons/pom.xml                      |  5 ++---
 .../boot/java/rewrite/RewriteRecipeRepositoryTest.java | 10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index 301240dc2..f1761c8c7 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.3.1</version>
+		<version>3.3.3</version>
 		<relativePath></relativePath>
 	</parent>
 
@@ -116,10 +116,9 @@
 		<reactor-netty>0.7.15.RELEASE</reactor-netty>
 		<commons-io-version>2.16.1</commons-io-version>
 		<commons-codec-version>1.13</commons-codec-version>
-		<kotlin.version>1.9.20</kotlin.version>
 
 		<!-- Rewrite specific properties -->
-		<rewrite-recipe-bom.version>2.14.0</rewrite-recipe-bom.version>
+		<rewrite-recipe-bom.version>2.17.0</rewrite-recipe-bom.version>
 		<gradle.version>8.4</gradle.version>
 		<rewrite-gradle-tooling-model.version>2.3.1</rewrite-gradle-tooling-model.version>
 		<jgit-version>6.9.0.202403050737-r</jgit-version>
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 5d19eee42..42ee03a2f 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
@@ -35,10 +35,10 @@ public class RewriteRecipeRepositoryTest {
 	@Test
 	void listSubRecipe() throws Exception {
 		List<Recipe> recipes = recipeRepo.getSubRecipes("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1", List.of()).get();
-		assertEquals(7, recipes.size());
+		assertEquals(9, recipes.size());
 		
 		recipes = recipeRepo.getSubRecipes("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1", List.of(0, 2)).get();
-		assertEquals(20, recipes.size());
+		assertEquals(19, recipes.size());
 		
 		recipes = recipeRepo.getSubRecipes("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1",List.of(0, 345)).get();
 		assertEquals(0, recipes.size());
@@ -100,7 +100,9 @@ public class RewriteRecipeRepositoryTest {
 				new RecipeSelectionDescriptor(false, "", null),
 				new RecipeSelectionDescriptor(false, "", null),
 				new RecipeSelectionDescriptor(false, "", null),
-				new RecipeSelectionDescriptor(true, "", null),
+				new RecipeSelectionDescriptor(false, "", null),
+				new RecipeSelectionDescriptor(true, "org.openrewrite.java.spring.security6.UpgradeSpringSecurity_6_1", null),
+				new RecipeSelectionDescriptor(false, "", null),
 				new RecipeSelectionDescriptor(false, "", null),
 				new RecipeSelectionDescriptor(false, "", null)
 		});
@@ -127,7 +129,7 @@ public class RewriteRecipeRepositoryTest {
 		
 		assertThat(java17.getRecipeList().get(0).getName()).isEqualTo("org.openrewrite.java.migrate.Java8toJava11");
 		assertThat(java17.getRecipeList().get(1).getName()).isEqualTo("org.openrewrite.java.migrate.UpgradeBuildToJava17");
-		assertThat(java17.getRecipeList().get(2).getName()).isEqualTo("org.openrewrite.java.migrate.RemovedModifierAndConstantBootstrapsConstructors");
+		assertThat(java17.getRecipeList().get(2).getName()).isEqualTo("org.openrewrite.java.migrate.lang.UseTextBlocks");
 		
 	}