Skip to content

Commit a3850af

Browse files
Updated IgnoredPatterns & Added support for more Rewrite recipes (#977)
- Updated IgnoredPatterns - Added support for more Rewrite recipes --------- Co-authored-by: Fabian Krüger <[email protected]>
1 parent 1f4eea2 commit a3850af

File tree

4 files changed

+26
-28
lines changed

4 files changed

+26
-28
lines changed

sbm-support-rewrite/pom.xml

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,15 @@
8888
<type>pom</type>
8989
<scope>import</scope>
9090
</dependency>
91+
<dependency>
92+
<groupId>org.openrewrite</groupId>
93+
<artifactId>rewrite-bom</artifactId>
94+
<version>${rewrite.version}</version>
95+
<type>pom</type>
96+
<scope>import</scope>
97+
</dependency>
9198
</dependencies>
9299
</dependencyManagement>
93-
94100
<dependencies>
95101
<dependency>
96102
<groupId>org.springframework.boot</groupId>
@@ -107,48 +113,49 @@
107113
</dependency>
108114
<dependency>
109115
<groupId>org.openrewrite</groupId>
110-
<artifactId>rewrite-maven</artifactId>
111-
<version>${rewrite.version}</version>
116+
<artifactId>rewrite-gradle</artifactId>
112117
</dependency>
113118
<dependency>
114119
<groupId>org.openrewrite</groupId>
115-
<artifactId>rewrite-java</artifactId>
116-
<version>${rewrite.version}</version>
120+
<artifactId>rewrite-groovy</artifactId>
117121
</dependency>
118122
<dependency>
119123
<groupId>org.openrewrite</groupId>
120-
<artifactId>rewrite-java-17</artifactId>
121-
<version>${rewrite.version}</version>
124+
<artifactId>rewrite-hcl</artifactId>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.openrewrite</groupId>
128+
<artifactId>rewrite-java</artifactId>
122129
</dependency>
123130
<dependency>
124131
<groupId>org.openrewrite</groupId>
125132
<artifactId>rewrite-json</artifactId>
126-
<version>${rewrite.version}</version>
127133
</dependency>
128134
<dependency>
129135
<groupId>org.openrewrite</groupId>
130-
<artifactId>rewrite-yaml</artifactId>
131-
<version>${rewrite.version}</version>
136+
<artifactId>rewrite-maven</artifactId>
132137
</dependency>
133138
<dependency>
134139
<groupId>org.openrewrite</groupId>
135-
<artifactId>rewrite-hcl</artifactId>
136-
<version>${rewrite.version}</version>
140+
<artifactId>rewrite-properties</artifactId>
137141
</dependency>
138142
<dependency>
139143
<groupId>org.openrewrite</groupId>
140144
<artifactId>rewrite-protobuf</artifactId>
141-
<version>${rewrite.version}</version>
142145
</dependency>
143146
<dependency>
144147
<groupId>org.openrewrite</groupId>
145148
<artifactId>rewrite-xml</artifactId>
146-
<version>${rewrite.version}</version>
147149
</dependency>
148150
<dependency>
149151
<groupId>org.openrewrite</groupId>
150-
<artifactId>rewrite-properties</artifactId>
151-
<version>${rewrite.version}</version>
152+
<artifactId>rewrite-yaml</artifactId>
153+
</dependency>
154+
<dependency>
155+
<groupId>org.openrewrite.maven</groupId>
156+
<artifactId>rewrite-maven-plugin</artifactId>
157+
<version>${rewrite-maven-plugin.version}</version>
158+
<scope>test</scope>
152159
</dependency>
153160
<dependency>
154161
<groupId>org.projectlombok</groupId>
@@ -183,13 +190,6 @@
183190
<artifactId>commons-cli</artifactId>
184191
<version>1.4</version>
185192
</dependency>
186-
187-
<dependency>
188-
<groupId>org.openrewrite.maven</groupId>
189-
<artifactId>rewrite-maven-plugin</artifactId>
190-
<version>${rewrite-maven-plugin.version}</version>
191-
<scope>test</scope>
192-
</dependency>
193193
<dependency>
194194
<groupId>org.apache.maven.wagon</groupId>
195195
<artifactId>wagon-http</artifactId>
@@ -274,7 +274,6 @@
274274
</dependency>
275275
<!-- END: Required by PrivateArtifactRepositoryTest -->
276276
</dependencies>
277-
278277
<build>
279278
<pluginManagement>
280279
<plugins>
@@ -295,7 +294,6 @@
295294
</plugin>
296295
</plugins>
297296
</pluginManagement>
298-
299297
<plugins>
300298
<plugin>
301299
<groupId>org.apache.maven.plugins</groupId>

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/ParserProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ public class ParserProperties {
8080
/**
8181
* Comma-separated list of patterns used to create PathMatcher to exclude paths from being parsed.
8282
*/
83-
private Set<String> ignoredPathPatterns = Set.of("**/target/**", "target/**", "**/.idea/**", ".idea/**", ".mvn/**", "**/.mvn/**");
83+
private Set<String> ignoredPathPatterns = Set.of("**/target/**", "target/**", "**/.idea/**", ".idea/**", "**/.git/**", ".git/**", ".mvn/**", "**/.mvn/**", "node_modules/**", "**/node_modules/**");
8484

8585
}

sbm-support-rewrite/src/main/resources/META-INF/sbm-support-rewrite.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ parser.sizeThresholdMb=10
1111
parser.runPerSubmodule=false
1212
parser.failOnInvalidActiveRecipes=true
1313
parser.activeProfiles=default
14-
parser.ignoredPathPatterns=**.idea/**,**.git/**,**/target/**,target/**
14+
parser.ignoredPathPatterns=**/.idea/**,.idea/**,**/.git/**,.git/**,**/.mvn/**,.mvn/**,**/target/**,target/**,**/node_modules/**,node_modules/**

sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/ParserPropertiesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void defaultActiveProfiles() {
8787
@Test
8888
@DisplayName("parser.ignoredPathPatterns")
8989
void defaultIgnoredPathPatterns() {
90-
assertThat(parserProperties.getIgnoredPathPatterns()).containsExactlyInAnyOrder("**.idea/**", "**.git/**", "**/target/**", "target/**");
90+
assertThat(parserProperties.getIgnoredPathPatterns()).containsExactlyInAnyOrder("**/target/**", "target/**", "**/.idea/**", ".idea/**", "**/.git/**", ".git/**", ".mvn/**", "**/.mvn/**", "node_modules/**", "**/node_modules/**");
9191
}
9292

9393
}

0 commit comments

Comments
 (0)