From 3bef1fc997cc84ab87453d7602307a13a222f448 Mon Sep 17 00:00:00 2001
From: aboyko <alex.boyko@broadcom.com>
Date: Thu, 4 Jul 2024 08:45:42 -0400
Subject: [PATCH] Polish poms

---
 .../commons/commons-rewrite/pom.xml              |  8 --------
 headless-services/commons/pom.xml                | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/headless-services/commons/commons-rewrite/pom.xml b/headless-services/commons/commons-rewrite/pom.xml
index 4c1e9df0d..eeb5e5705 100644
--- a/headless-services/commons/commons-rewrite/pom.xml
+++ b/headless-services/commons/commons-rewrite/pom.xml
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>org.openrewrite.gradle.tooling</groupId>
             <artifactId>model</artifactId>
-            <version>2.3.1</version>
         </dependency>
 		<dependency>
 			<groupId>org.gradle</groupId>
@@ -99,7 +98,6 @@
 		<dependency>
 			<groupId>org.eclipse.jgit</groupId>
 			<artifactId>org.eclipse.jgit</artifactId>
-			<version>${jgit-version}</version>
 		</dependency>
 		<dependency>
 		    <groupId>javax.xml.bind</groupId>
@@ -110,12 +108,6 @@
 		<dependency>
 			<groupId>org.openrewrite.recipe</groupId>
 			<artifactId>rewrite-spring</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.openrewrite</groupId>
-					<artifactId>rewrite-kotlin</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		
 		<dependency>
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index 8cacbe059..2eeec7ebb 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -119,9 +119,9 @@
 		<kotlin.version>1.9.20</kotlin.version>
 
 		<!-- Rewrite specific properties -->
-        <rewrite-recipe-bom.version>2.14.0</rewrite-recipe-bom.version>
-        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
-        <gradle.version>8.4</gradle.version>
+		<rewrite-recipe-bom.version>2.14.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>
 		
 		<antlr.version>4.13.1</antlr.version>
@@ -144,6 +144,16 @@
                 <artifactId>gradle-tooling-api</artifactId>
                 <version>${gradle.version}</version>
             </dependency>
+	        <dependency>
+	            <groupId>org.openrewrite.gradle.tooling</groupId>
+	            <artifactId>model</artifactId>
+	            <version>${rewrite-gradle-tooling-model.version}</version>
+	        </dependency>
+			<dependency>
+				<groupId>org.eclipse.jgit</groupId>
+				<artifactId>org.eclipse.jgit</artifactId>
+				<version>${jgit-version}</version>
+			</dependency>
         </dependencies>
     </dependencyManagement>