Skip to content

Commit 7e3e9c2

Browse files
authored
Merge branch 'version/revamp' into revamp/997-example-of-iterative-upgrade
2 parents 009b943 + a3850af commit 7e3e9c2

17 files changed

+279
-333
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/ModuleParser.java

Lines changed: 0 additions & 278 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import lombok.RequiredArgsConstructor;
2020
import org.openrewrite.xml.tree.Xml;
2121
import org.springframework.core.io.Resource;
22+
import org.springframework.sbm.parsers.maven.MavenProject;
2223
import org.springframework.sbm.utils.ResourceUtil;
2324

2425
import java.nio.file.Path;

0 commit comments

Comments
 (0)