spring-projects · fabapp2 · Jul 1, 2024 · Jul 1, 2024 · Jul 1, 2024 · Jul 1, 2024
diff --git a/pom.xml b/pom.xml
@@ -33,13 +33,18 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- prod dependencies -->
-        <spring-boot.version>3.2.1</spring-boot.version>
-        <rewrite.version>8.13.4</rewrite.version>
-        <rewrite-kotlin.version>1.8.4</rewrite-kotlin.version>
-        <rewrite-polyglot.version>1.8.11</rewrite-polyglot.version>
-        <rewrite-maven-plugin.version>5.20.0</rewrite-maven-plugin.version>
+        <spring-boot.version>3.3.1</spring-boot.version>
+
+        <!-- rewrite -->
+        <rewrite-bom.version>8.28.1</rewrite-bom.version>
+        <rewrite-recipe-bom.version>2.13.2</rewrite-recipe-bom.version> <!-- brings rewrite-bom -->
+        <rewrite-maven-plugin.version>5.34.1</rewrite-maven-plugin.version>
+        <rewrite-kotlin.version>1.18.1</rewrite-kotlin.version>
+        <rewrite-polyglot.version>1.12.2</rewrite-polyglot.version>
+
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <gradle-tooling-api.version>8.4</gradle-tooling-api.version>
+        <gradle-tooling-model.version>1.1.2</gradle-tooling-model.version>
         <maven.version>3.9.1</maven.version>
         <maven-invoker.version>3.2.0</maven-invoker.version>
         <maven-shared-utils.version>3.4.2</maven-shared-utils.version>
@@ -48,7 +53,7 @@
         <maven-resolver.version>1.9.13</maven-resolver.version>
         <maven-wagon-http.version>3.5.3</maven-wagon-http.version>
         <plexus-cypher.version>1.8</plexus-cypher.version>
-        <junit-pioneer.version>2.1.0</junit-pioneer.version>
+        <junit-pioneer.version>2.2.0</junit-pioneer.version>
 
         <!-- documentation dependencies -->
         <io.spring.maven.antora-version>0.0.4</io.spring.maven.antora-version>
@@ -128,8 +133,27 @@
             </dependency>
             <dependency>
                 <groupId>org.openrewrite</groupId>
-                <artifactId>rewrite-core</artifactId>
-                <version>${rewrite.version}</version>
+                <artifactId>rewrite-bom</artifactId>
+                <version>${rewrite-bom.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.openrewrite.recipe</groupId>
+                <artifactId>rewrite-recipe-bom</artifactId>
+                <version>${rewrite-recipe-bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.openrewrite</groupId>
+                <artifactId>rewrite-kotlin</artifactId>
+                <version>${rewrite-kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openrewrite</groupId>
+                <artifactId>rewrite-polyglot</artifactId>
+                <version>${rewrite-polyglot.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework.rewrite</groupId>

diff --git a/spring-rewrite-commons-examples/boot-3-upgrade-iterative-example/pom.xml b/spring-rewrite-commons-examples/boot-3-upgrade-iterative-example/pom.xml
@@ -31,6 +31,11 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
+            <version>6.10.0.202406032230-r</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

diff --git a/...iterative-example/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java b/...iterative-example/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java
@@ -19,21 +19,21 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.jgit.api.CreateBranchCommand;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.ListBranchCommand;
+import org.eclipse.jgit.api.ResetCommand;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.jetbrains.annotations.NotNull;
 import org.kohsuke.github.GHPullRequest;
 import org.kohsuke.github.GHRepository;
 import org.kohsuke.github.GitHub;
 import org.kohsuke.github.GitHubBuilder;
 import org.openrewrite.Recipe;
 import org.openrewrite.SourceFile;
-import org.openrewrite.shaded.jgit.api.CreateBranchCommand;
-import org.openrewrite.shaded.jgit.api.Git;
-import org.openrewrite.shaded.jgit.api.ListBranchCommand;
-import org.openrewrite.shaded.jgit.api.ResetCommand;
-import org.openrewrite.shaded.jgit.api.errors.GitAPIException;
-import org.openrewrite.shaded.jgit.lib.Ref;
-import org.openrewrite.shaded.jgit.revwalk.RevCommit;
-import org.openrewrite.shaded.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;

diff --git a/spring-rewrite-commons-functional-tests/pom.xml b/spring-rewrite-commons-functional-tests/pom.xml
@@ -33,28 +33,8 @@
 
         <!-- prod dependencies -->
         <spring-boot.version>3.1.3</spring-boot.version>
-        <rewrite-recipe-bom.version>2.6.2</rewrite-recipe-bom.version>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.openrewrite.recipe</groupId>
-                <artifactId>rewrite-recipe-bom</artifactId>
-                <version>${rewrite-recipe-bom.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.rewrite</groupId>

diff --git a/...repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java b/...repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java
@@ -340,7 +340,6 @@ private void buildProject(Path dependentPomPath) throws MavenInvocationException
 
 		static void unzip(Path repoDir) {
 			try {
-				;
 				ZipFile zipFile = new ZipFile(REPOSITORIES_ZIP);
 				zipFile.extractAll(repoDir.toString());
 			}

diff --git a/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/pom.xml b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/pom.xml
@@ -16,7 +16,6 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <gradle-tooling-model.version>1.1.2</gradle-tooling-model.version>
     </properties>
 
     <dependencies>

diff --git a/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/pom.xml b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-parser/pom.xml
@@ -33,77 +33,62 @@
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-core</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-gradle</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-groovy</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-hcl</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java-8</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java-11</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java-17</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-json</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-kotlin</artifactId>
-            <version>${rewrite-kotlin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-properties</artifactId>
-            <version>${rewrite.version}</version>
         </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-yaml</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-polyglot</artifactId>
-            <version>${rewrite-polyglot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/pom.xml b/spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-plugin/pom.xml
@@ -16,7 +16,6 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <lombok.version>1.18.30</lombok.version>
     </properties>
 
     <dependencies>
@@ -44,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>${maven-compiler-plugin.version}</version>
             </plugin>
         </plugins>
     </build>

diff --git a/spring-rewrite-commons-launcher/pom.xml b/spring-rewrite-commons-launcher/pom.xml
@@ -34,47 +34,38 @@
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-maven</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java</artifactId>
-            <version>${rewrite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java-17</artifactId>
-            <version>${rewrite.version}</version>
         </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>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-hcl</artifactId>
-            <version>${rewrite.version}</version>
         </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>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>

diff --git a/...r/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserLstParityTest.java b/...r/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserLstParityTest.java
@@ -30,7 +30,6 @@
 import org.openrewrite.Parser;
 import org.openrewrite.SourceFile;
 import org.openrewrite.java.tree.J;
-import org.openrewrite.shaded.jgit.api.errors.GitAPIException;
 import org.openrewrite.tree.ParsingEventListener;
 import org.openrewrite.tree.ParsingExecutionContextView;
 import org.springframework.rewrite.parser.maven.ComparingParserFactory;
@@ -111,7 +110,7 @@ void parse4Modules() {
 
 	@Test
 	@DisplayName("Parsing Simplistic Maven Project ")
-	void parsingSimplisticMavenProject(@TempDir Path tempDir) throws GitAPIException {
+	void parsingSimplisticMavenProject(@TempDir Path tempDir) {
 		@Language("xml")
 		String pomXml = """
 				<?xml version="1.0" encoding="UTF-8"?>

diff --git a/...src/test/java/org/springframework/rewrite/parser/maven/MavenMojoProjectParserFactory.java b/...src/test/java/org/springframework/rewrite/parser/maven/MavenMojoProjectParserFactory.java
@@ -73,12 +73,13 @@ private MavenMojoProjectParser buildMavenMojoProjectParser(Path baseDir, PlexusC
 
 	public MavenMojoProjectParser create(Path baseDir, RuntimeInformation runtimeInformation,
 			SettingsDecrypter settingsDecrypter) {
+		boolean parseAdditionalResources = true;
 		return new MavenMojoProjectParser(new Slf4jToMavenLoggerAdapter(LOGGER), baseDir,
 				springRewriteProperties.isPomCacheEnabled(), springRewriteProperties.getPomCacheDirectory(),
 				runtimeInformation, springRewriteProperties.isSkipMavenParsing(),
 				springRewriteProperties.getIgnoredPathPatterns(), springRewriteProperties.getPlainTextMasks(),
 				springRewriteProperties.getSizeThresholdMb(), null, settingsDecrypter,
-				springRewriteProperties.isRunPerSubmodule());
+				springRewriteProperties.isRunPerSubmodule(), parseAdditionalResources);
 	}
 
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		static void unzip(Path repoDir) {
     			try {
-    				;
     				ZipFile zipFile = new ZipFile(REPOSITORIES_ZIP);
     				zipFile.extractAll(repoDir.toString());
     			}
@@ Expand Down @@