diff --git a/sbm-support-rewrite/pom.xml b/sbm-support-rewrite/pom.xml index a9fd0c760..7a64eeb1f 100644 --- a/sbm-support-rewrite/pom.xml +++ b/sbm-support-rewrite/pom.xml @@ -88,9 +88,15 @@ pom import + + org.openrewrite + rewrite-bom + ${rewrite.version} + pom + import + - org.springframework.boot @@ -107,48 +113,49 @@ org.openrewrite - rewrite-maven - ${rewrite.version} + rewrite-gradle org.openrewrite - rewrite-java - ${rewrite.version} + rewrite-groovy org.openrewrite - rewrite-java-17 - ${rewrite.version} + rewrite-hcl + + + org.openrewrite + rewrite-java org.openrewrite rewrite-json - ${rewrite.version} org.openrewrite - rewrite-yaml - ${rewrite.version} + rewrite-maven org.openrewrite - rewrite-hcl - ${rewrite.version} + rewrite-properties org.openrewrite rewrite-protobuf - ${rewrite.version} org.openrewrite rewrite-xml - ${rewrite.version} org.openrewrite - rewrite-properties - ${rewrite.version} + rewrite-yaml + + + org.openrewrite.maven + rewrite-maven-plugin + ${rewrite-maven-plugin.version} + test org.projectlombok @@ -183,13 +190,6 @@ commons-cli 1.4 - - - org.openrewrite.maven - rewrite-maven-plugin - ${rewrite-maven-plugin.version} - test - org.apache.maven.wagon wagon-http @@ -274,7 +274,6 @@ - @@ -295,7 +294,6 @@ - org.apache.maven.plugins 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 22686b6b4..0d45e60f1 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 @@ -80,6 +80,6 @@ public class ParserProperties { /** * Comma-separated list of patterns used to create PathMatcher to exclude paths from being parsed. */ - private Set ignoredPathPatterns = Set.of("**/target/**", "target/**", "**/.idea/**", ".idea/**", ".mvn/**", "**/.mvn/**"); + private Set 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 f059bb0c0..e79c98039 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 @@ -11,4 +11,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/** 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/**"); } }