From 17fcb44be28593ea22b9dd9c472a610bdab191bf Mon Sep 17 00:00:00 2001
From: Ujjwal Shrestha <ujjwal.shrestha@outlook.com>
Date: Wed, 18 Oct 2023 12:29:53 -0400
Subject: [PATCH 1/4] Updated IgnoredPatterns Added support for more Rewrite
 recipes

---
 sbm-support-rewrite/pom.xml                   | 140 +++++++++++++++---
 .../sbm/parsers/ParserProperties.java         |   2 +-
 .../META-INF/sbm-support-rewrite.properties   |   2 +-
 3 files changed, 120 insertions(+), 24 deletions(-)

diff --git a/sbm-support-rewrite/pom.xml b/sbm-support-rewrite/pom.xml
index 4be8876c6..d8f865aaf 100644
--- a/sbm-support-rewrite/pom.xml
+++ b/sbm-support-rewrite/pom.xml
@@ -22,6 +22,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-boot.version>3.1.3</spring-boot.version>
         <rewrite.version>8.5.1</rewrite.version>
+        <rewrite-recipe.version>2.3.0</rewrite-recipe.version>
         <rewrite-maven-plugin.version>5.3.2</rewrite-maven-plugin.version>
         <maven.version>3.9.1</maven.version>
         <maven-resolver.version>1.9.13</maven-resolver.version>
@@ -88,6 +89,20 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.openrewrite</groupId>
+                <artifactId>rewrite-bom</artifactId>
+                <version>${rewrite.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.openrewrite.recipe</groupId>
+                <artifactId>rewrite-recipe-bom</artifactId>
+                <version>${rewrite-recipe.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -107,48 +122,136 @@
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-maven</artifactId>
-            <version>${rewrite.version}</version>
+            <artifactId>rewrite-gradle</artifactId>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-java</artifactId>
-            <version>${rewrite.version}</version>
+            <artifactId>rewrite-groovy</artifactId>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-java-17</artifactId>
-            <version>${rewrite.version}</version>
+            <artifactId>rewrite-hcl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-java-dependencies</artifactId>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-json</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-yaml</artifactId>
-            <version>${rewrite.version}</version>
+            <artifactId>rewrite-maven</artifactId>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-hcl</artifactId>
-            <version>${rewrite.version}</version>
+            <artifactId>rewrite-properties</artifactId>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-protobuf</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-xml</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
-            <artifactId>rewrite-properties</artifactId>
-            <version>${rewrite.version}</version>
+            <artifactId>rewrite-yaml</artifactId>
+        </dependency>
+        <!--<dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-python</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-kotlin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-javascript</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-polyglot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-templating</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-ai-search</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-cucumber-jvm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-hibernate</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-java-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-logging-frameworks</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-micrometer</artifactId>
+        </dependency>
+        <!--<dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-micronaut</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-migrate-java</artifactId>
+        </dependency>
+        <!--<dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-okhttp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-quarkus</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-recommendations</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-sql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-static-analysis</artifactId>
+        </dependency>
+        <!--<dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-terraform</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-testing-frameworks</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.maven</groupId>
+            <artifactId>rewrite-maven-plugin</artifactId>
+            <version>${rewrite-maven-plugin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -183,13 +286,6 @@
             <artifactId>commons-cli</artifactId>
             <version>1.4</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.openrewrite.maven</groupId>
-            <artifactId>rewrite-maven-plugin</artifactId>
-            <version>${rewrite-maven-plugin.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven.wagon</groupId>
             <artifactId>wagon-http</artifactId>
diff --git a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/ParserProperties.java b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/ParserProperties.java
index 1aa8cdd67..a3189da76 100644
--- a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/ParserProperties.java
+++ b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/ParserProperties.java
@@ -79,6 +79,6 @@ public class ParserProperties {
     /**
      * Comma-separated list of patterns used to create PathMatcher to exclude paths from being parsed.
      */
-    private Set<String> ignoredPathPatterns = Set.of("**/target/**", "target/**", "**/.idea/**", ".idea/**", ".mvn/**", "**/.mvn/**");
+    private Set<String> ignoredPathPatterns = Set.of("**/target/**", "target/**", "**/.idea/**", ".idea/**", "**/.git/**", ".git/**", ".mvn/**", "**/.mvn/**", "node_modules/**", "**/node_modules/**");
 
 }
diff --git a/sbm-support-rewrite/src/main/resources/META-INF/sbm-support-rewrite.properties b/sbm-support-rewrite/src/main/resources/META-INF/sbm-support-rewrite.properties
index 0d564fd91..063e56bce 100644
--- a/sbm-support-rewrite/src/main/resources/META-INF/sbm-support-rewrite.properties
+++ b/sbm-support-rewrite/src/main/resources/META-INF/sbm-support-rewrite.properties
@@ -27,4 +27,4 @@ parser.sizeThresholdMb=10
 parser.runPerSubmodule=false
 parser.failOnInvalidActiveRecipes=true
 parser.activeProfiles=default
-parser.ignoredPathPatterns=**.idea,**.git,**/target/**,target/**
+parser.ignoredPathPatterns=**/.idea/**,.idea/**,**/.git/**,.git/**,**/.mvn/**,.mvn/**,**/target/**,target/**,**/node_modules/**,node_modules/**

From 1200075c0d55ddd715db94ce7b3409e72afdcab8 Mon Sep 17 00:00:00 2001
From: Ujjwal Shrestha <ujjwal.shrestha@outlook.com>
Date: Thu, 19 Oct 2023 15:31:31 -0400
Subject: [PATCH 2/4] Added rewrite-maven-plugin to test scope

---
 sbm-support-rewrite/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sbm-support-rewrite/pom.xml b/sbm-support-rewrite/pom.xml
index d8f865aaf..49be4a5b4 100644
--- a/sbm-support-rewrite/pom.xml
+++ b/sbm-support-rewrite/pom.xml
@@ -252,6 +252,7 @@
             <groupId>org.openrewrite.maven</groupId>
             <artifactId>rewrite-maven-plugin</artifactId>
             <version>${rewrite-maven-plugin.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

From d77441877edca812d0c63a98ba79f13337fbb5a0 Mon Sep 17 00:00:00 2001
From: Ujjwal Shrestha <ujjwal.shrestha@outlook.com>
Date: Wed, 8 Nov 2023 11:05:12 -0500
Subject: [PATCH 3/4] Fix failed testcase

---
 .../org/springframework/sbm/parsers/ParserPropertiesTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/ParserPropertiesTest.java b/sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/ParserPropertiesTest.java
index b7c9e6988..e0d650589 100644
--- a/sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/ParserPropertiesTest.java
+++ b/sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/ParserPropertiesTest.java
@@ -87,7 +87,7 @@ void defaultActiveProfiles() {
         @Test
         @DisplayName("parser.ignoredPathPatterns")
         void defaultIgnoredPathPatterns() {
-            assertThat(parserProperties.getIgnoredPathPatterns()).containsExactlyInAnyOrder("**.idea/**", "**.git/**", "**/target/**", "target/**");
+            assertThat(parserProperties.getIgnoredPathPatterns()).containsExactlyInAnyOrder("**/target/**", "target/**", "**/.idea/**", ".idea/**", "**/.git/**", ".git/**", ".mvn/**", "**/.mvn/**", "node_modules/**", "**/node_modules/**");
         }
 
     }

From 61e0acd2b044fe4e20e6fe5889b05300d2174b8a Mon Sep 17 00:00:00 2001
From: Ujjwal Shrestha <ujjwal.shrestha@outlook.com>
Date: Tue, 14 Nov 2023 14:14:43 -0500
Subject: [PATCH 4/4] Removed OR Recipe

---
 sbm-support-rewrite/pom.xml | 53 -------------------------------------
 1 file changed, 53 deletions(-)

diff --git a/sbm-support-rewrite/pom.xml b/sbm-support-rewrite/pom.xml
index fde9cc61b..7a64eeb1f 100644
--- a/sbm-support-rewrite/pom.xml
+++ b/sbm-support-rewrite/pom.xml
@@ -22,7 +22,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-boot.version>3.1.3</spring-boot.version>
         <rewrite.version>8.5.1</rewrite.version>
-        <rewrite-recipe.version>2.3.0</rewrite-recipe.version>
         <rewrite-maven-plugin.version>5.3.2</rewrite-maven-plugin.version>
         <maven.version>3.9.1</maven.version>
         <maven-resolver.version>1.9.13</maven-resolver.version>
@@ -96,16 +95,8 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.openrewrite.recipe</groupId>
-                <artifactId>rewrite-recipe-bom</artifactId>
-                <version>${rewrite-recipe.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -136,10 +127,6 @@
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.openrewrite.recipe</groupId>
-            <artifactId>rewrite-java-dependencies</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-json</artifactId>
@@ -164,46 +151,6 @@
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-yaml</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.openrewrite.recipe</groupId>
-            <artifactId>rewrite-cucumber-jvm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite.recipe</groupId>
-            <artifactId>rewrite-hibernate</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite.recipe</groupId>
-            <artifactId>rewrite-java-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite.recipe</groupId>
-            <artifactId>rewrite-logging-frameworks</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite.recipe</groupId>
-            <artifactId>rewrite-micrometer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite.recipe</groupId>
-            <artifactId>rewrite-migrate-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite.recipe</groupId>
-            <artifactId>rewrite-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite.recipe</groupId>
-            <artifactId>rewrite-sql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite.recipe</groupId>
-            <artifactId>rewrite-static-analysis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openrewrite.recipe</groupId>
-            <artifactId>rewrite-testing-frameworks</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.openrewrite.maven</groupId>
             <artifactId>rewrite-maven-plugin</artifactId>