From ca4560f405ea9bcd6b452ab56f6eb9a9f859e0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= Date: Mon, 1 Jul 2024 10:33:27 +0200 Subject: [PATCH 01/10] Use managed dependencies for rewrite --- pom.xml | 25 +++++++++++++++---- .../pom.xml | 15 ----------- spring-rewrite-commons-launcher/pom.xml | 9 ------- spring-rewrite-commons-test/pom.xml | 1 - 4 files changed, 20 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index 66339391..e567b6eb 100644 --- a/pom.xml +++ b/pom.xml @@ -34,10 +34,13 @@ 3.2.1 - 8.13.4 - 1.8.4 - 1.8.11 + + + 8.13.4 5.20.0 + 1.10.0 + 1.9.2 + 2.3.1 8.4 3.9.1 @@ -128,8 +131,20 @@ org.openrewrite - rewrite-core - ${rewrite.version} + rewrite-bom + ${rewrite-bom.version} + import + pom + + + org.openrewrite + rewrite-kotlin + ${rewrite-kotlin.version} + + + org.openrewrite + rewrite-polyglot + ${rewrite-polyglot.version} org.springframework.rewrite 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 index 01d37a88..d28964fa 100644 --- 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 @@ org.openrewrite rewrite-core - ${rewrite.version} org.openrewrite rewrite-gradle - ${rewrite.version} org.openrewrite rewrite-groovy - ${rewrite.version} org.openrewrite rewrite-hcl - ${rewrite.version} org.openrewrite rewrite-java - ${rewrite.version} org.openrewrite rewrite-java-8 - ${rewrite.version} org.openrewrite rewrite-java-11 - ${rewrite.version} org.openrewrite rewrite-java-17 - ${rewrite.version} org.openrewrite rewrite-json - ${rewrite.version} org.openrewrite rewrite-kotlin - ${rewrite-kotlin.version} org.openrewrite rewrite-properties - ${rewrite.version} org.openrewrite rewrite-protobuf - ${rewrite.version} org.openrewrite rewrite-xml - ${rewrite.version} org.openrewrite rewrite-yaml - ${rewrite.version} org.openrewrite rewrite-polyglot - ${rewrite-polyglot.version} org.junit.jupiter diff --git a/spring-rewrite-commons-launcher/pom.xml b/spring-rewrite-commons-launcher/pom.xml index 16757cb3..b95d8197 100644 --- a/spring-rewrite-commons-launcher/pom.xml +++ b/spring-rewrite-commons-launcher/pom.xml @@ -34,47 +34,38 @@ org.openrewrite rewrite-maven - ${rewrite.version} org.openrewrite rewrite-java - ${rewrite.version} org.openrewrite rewrite-java-17 - ${rewrite.version} org.openrewrite rewrite-json - ${rewrite.version} org.openrewrite rewrite-yaml - ${rewrite.version} org.openrewrite rewrite-hcl - ${rewrite.version} org.openrewrite rewrite-protobuf - ${rewrite.version} org.openrewrite rewrite-xml - ${rewrite.version} org.openrewrite rewrite-properties - ${rewrite.version} javax.xml.bind diff --git a/spring-rewrite-commons-test/pom.xml b/spring-rewrite-commons-test/pom.xml index fb6d52e7..bb4bf4e7 100644 --- a/spring-rewrite-commons-test/pom.xml +++ b/spring-rewrite-commons-test/pom.xml @@ -34,7 +34,6 @@ org.openrewrite rewrite-core - ${rewrite.version} org.springframework.boot From 8ced64ff4de8f33d71a67e5b4b6e472fcd74d959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= Date: Mon, 1 Jul 2024 10:53:13 +0200 Subject: [PATCH 02/10] Polish poms --- pom.xml | 8 ++++++++ .../pom.xml | 20 ------------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index e567b6eb..1f6fecff 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ 8.13.4 + 2.6.2 5.20.0 1.10.0 1.9.2 @@ -136,6 +137,13 @@ import pom + + org.openrewrite.recipe + rewrite-recipe-bom + ${rewrite-recipe-bom.version} + pom + import + org.openrewrite rewrite-kotlin diff --git a/spring-rewrite-commons-functional-tests/pom.xml b/spring-rewrite-commons-functional-tests/pom.xml index 6602565b..541d8f61 100644 --- a/spring-rewrite-commons-functional-tests/pom.xml +++ b/spring-rewrite-commons-functional-tests/pom.xml @@ -33,28 +33,8 @@ 3.1.3 - 2.6.2 - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - org.openrewrite.recipe - rewrite-recipe-bom - ${rewrite-recipe-bom.version} - pom - import - - - - org.springframework.rewrite From 3df4b7dd3b83d2bfd2c8e28ad34da561101c1fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= Date: Mon, 1 Jul 2024 12:41:31 +0200 Subject: [PATCH 03/10] Polish poms * Remove unused dependencies * Deeclare properties in root pom * Use OR boms where possible --- pom.xml | 1 + .../spring-rewrite-commons-rewrite-gradle-model/pom.xml | 1 - .../spring-rewrite-commons-rewrite-gradle-plugin/pom.xml | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1f6fecff..57ee9652 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ 2.3.1 8.4 + 1.1.2 3.9.1 3.2.0 3.4.2 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 index 67da2526..49f94802 100644 --- 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 @@ 17 17 UTF-8 - 1.1.2 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 index b8f056d9..9381e64e 100644 --- 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 @@ 17 17 UTF-8 - 1.18.30 @@ -44,7 +43,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + ${maven-compiler-plugin.version} From 1bf04419c3827c8d7dec25e96b91b2d6fedbe12a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= Date: Mon, 1 Jul 2024 16:36:00 +0200 Subject: [PATCH 04/10] Bumped OR versions --- pom.xml | 10 ++-- .../boot-3-upgrade-iterative-example/pom.xml | 5 ++ .../IterativeBoot3UpgradeExample.java | 16 +++---- .../RewriteProjectParserLstParityTest.java | 3 +- .../maven/MavenMojoProjectParserFactory.java | 3 +- .../maven/ProvenanceMarkerFactoryTest.java | 46 +++++++++++++------ .../gradle/RewriteGradlePluginTest.java | 1 + 7 files changed, 53 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 57ee9652..5d608c7e 100644 --- a/pom.xml +++ b/pom.xml @@ -36,11 +36,11 @@ 3.2.1 - 8.13.4 - 2.6.2 - 5.20.0 - 1.10.0 - 1.9.2 + 8.28.1 + 2.13.2 + 5.34.1 + 1.18.1 + 1.12.2 2.3.1 8.4 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 index 5c386958..e9499f5b 100644 --- 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 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml + + org.eclipse.jgit + org.eclipse.jgit + 6.10.0.202406032230-r + org.springframework.boot spring-boot-starter-test diff --git a/spring-rewrite-commons-examples/boot-3-upgrade-iterative-example/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java b/spring-rewrite-commons-examples/boot-3-upgrade-iterative-example/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java index 0091e1ab..4cc36424 100644 --- a/spring-rewrite-commons-examples/boot-3-upgrade-iterative-example/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java +++ b/spring-rewrite-commons-examples/boot-3-upgrade-iterative-example/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java @@ -19,6 +19,14 @@ 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; @@ -26,14 +34,6 @@ 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-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserLstParityTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserLstParityTest.java index 69d937cc..e0e8cd56 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserLstParityTest.java +++ b/spring-rewrite-commons-launcher/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 = """ diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenMojoProjectParserFactory.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenMojoProjectParserFactory.java index 362e55bb..bbd29c64 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenMojoProjectParserFactory.java +++ b/spring-rewrite-commons-launcher/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); } } diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactoryTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactoryTest.java index 053dadfd..3b0e9a2f 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactoryTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactoryTest.java @@ -25,15 +25,15 @@ import org.junit.jupiter.api.Test; import org.openrewrite.java.marker.JavaProject; import org.openrewrite.java.marker.JavaVersion; +import org.openrewrite.jgit.api.Git; +import org.openrewrite.jgit.lib.Repository; +import org.openrewrite.jgit.storage.file.FileRepositoryBuilder; import org.openrewrite.marker.BuildTool; import org.openrewrite.marker.GitProvenance; import org.openrewrite.marker.Marker; import org.openrewrite.marker.OperatingSystemProvenance; import org.openrewrite.marker.ci.BuildEnvironment; import org.openrewrite.maven.MavenMojoProjectParser; -import org.openrewrite.shaded.jgit.api.Git; -import org.openrewrite.shaded.jgit.lib.Repository; -import org.openrewrite.shaded.jgit.storage.file.FileRepositoryBuilder; import org.springframework.core.io.Resource; import org.springframework.rewrite.parser.ParserContext; import org.springframework.rewrite.parser.SpringRewriteProperties; @@ -95,23 +95,35 @@ void testMavenMojoProjectParserGenerateProvenance() { List markers = sut.generateProvenance(mavenModel); // and assert markers - int numExpectedMarkers = 5; + int numExpectedMarkers = 4; if (isGithubAction()) { - numExpectedMarkers = 6; // CI marker + numExpectedMarkers = 5; // CI marker } + assertThat(markers).hasSize(numExpectedMarkers); - JavaVersion jv = findMarker(markers, JavaVersion.class); - assertThat(countGetters(jv)).isEqualTo(7); - assertThat(jv.getCreatedBy()).isEqualTo(System.getProperty("java.specification.version")); - // assertThat(jv.getMajorVersion()).isEqualTo(Integer.parseInt(System.getProperty("java.specification.version"))); - assertThat(jv.getMajorVersion()).isEqualTo(17); - assertThat(jv.getSourceCompatibility()).isEqualTo("17"); - assertThat(jv.getTargetCompatibility()).isEqualTo("17"); - assertThat(jv.getMajorReleaseVersion()).isEqualTo(17); - assertThat(jv.getVmVendor()).isEqualTo(System.getProperty("java.vm.vendor")); - assertThat(jv.getId()).isInstanceOf(UUID.class); + // JavaVersion marker + // FIXME: JavaVersion marker are now generated by getSrcTestJavaVersion + // and getSrcMainJavaVersion + // Also, these methods are not accessible anymore and markers are added + // during `listSourceFiles` + /* + * JavaVersion jv = findMarker(markers, JavaVersion.class); + * assertThat(countGetters(jv)).isEqualTo(7); + * assertThat(jv.getCreatedBy()).isEqualTo(System.getProperty( + * "java.specification.version")); // + * assertThat(jv.getMajorVersion()).isEqualTo(Integer.parseInt(System. + * getProperty("java.specification.version"))); + * assertThat(jv.getMajorVersion()).isEqualTo(17); + * assertThat(jv.getSourceCompatibility()).isEqualTo("17"); + * assertThat(jv.getTargetCompatibility()).isEqualTo("17"); + * assertThat(jv.getMajorReleaseVersion()).isEqualTo(17); + * assertThat(jv.getVmVendor()).isEqualTo(System.getProperty( + * "java.vm.vendor")); assertThat(jv.getId()).isInstanceOf(UUID.class); + */ + + // JavaProject marker JavaProject jp = findMarker(markers, JavaProject.class); assertThat(countGetters(jp)).isEqualTo(3); assertThat(jp.getId()).isInstanceOf(UUID.class); @@ -127,6 +139,8 @@ void testMavenMojoProjectParserGenerateProvenance() { String gitHash = getCurrentGitHash(); GitProvenance expectedGitProvenance = GitProvenance.fromProjectDirectory(baseDir, BuildEnvironment.build(System::getenv)); + + // GitProvenance marker GitProvenance gitProvenance = findMarker(markers, GitProvenance.class); assertThat(countGetters(gitProvenance)).isEqualTo(10); assertThat(gitProvenance.getId()).isInstanceOf(UUID.class); @@ -145,12 +159,14 @@ void testMavenMojoProjectParserGenerateProvenance() { // notEmpty failed in GH assertThat(gitProvenance.getCommitters()).isNotNull(); + // OperatingSystemProvenance marker OperatingSystemProvenance operatingSystemProvenance = findMarker(markers, OperatingSystemProvenance.class); OperatingSystemProvenance expected = OperatingSystemProvenance.current(); assertThat(operatingSystemProvenance.getName()).isEqualTo(expected.getName()); // ... + // BuildTool marker BuildTool buildTool = findMarker(markers, BuildTool.class); assertThat(countGetters(buildTool)).isEqualTo(3); assertThat(buildTool.getId()).isInstanceOf(UUID.class); diff --git a/spring-rewrite-commons-plugin-invoker/spring-rewrite-commons-plugin-invoker-gradle/src/test/java/org/springframework/rewrite/plugin/gradle/RewriteGradlePluginTest.java b/spring-rewrite-commons-plugin-invoker/spring-rewrite-commons-plugin-invoker-gradle/src/test/java/org/springframework/rewrite/plugin/gradle/RewriteGradlePluginTest.java index 284665d3..bf720acb 100644 --- a/spring-rewrite-commons-plugin-invoker/spring-rewrite-commons-plugin-invoker-gradle/src/test/java/org/springframework/rewrite/plugin/gradle/RewriteGradlePluginTest.java +++ b/spring-rewrite-commons-plugin-invoker/spring-rewrite-commons-plugin-invoker-gradle/src/test/java/org/springframework/rewrite/plugin/gradle/RewriteGradlePluginTest.java @@ -53,6 +53,7 @@ void simpleProjectMinimalSetup() { PluginInvocationResult result = RewriteGradlePlugin.dryRun() .recipes(RECIPES) .usingPluginVersion("6.10.0") + .withMemory("128M", "512M") .onDir(baseDir); String out = result.capturedOutput(); From 08e5679976c3c03e8d2ea4a587a8585db20b52aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= Date: Mon, 1 Jul 2024 17:14:12 +0200 Subject: [PATCH 05/10] Bump Boot to 3.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d608c7e..892f7e99 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 - 3.2.1 + 3.3.1 8.28.1 From f1b4bbe6dc4c62eb7c19d456351eff66d6874758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= Date: Mon, 1 Jul 2024 17:14:14 +0200 Subject: [PATCH 06/10] Bump commons-io --- spring-rewrite-commons-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-rewrite-commons-test/pom.xml b/spring-rewrite-commons-test/pom.xml index bb4bf4e7..8c8472ab 100644 --- a/spring-rewrite-commons-test/pom.xml +++ b/spring-rewrite-commons-test/pom.xml @@ -28,7 +28,7 @@ commons-io commons-io - 2.11.0 + 2.16.1 From 99ce1acc128c80929d3b68ddfe858036cbe082ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= Date: Mon, 1 Jul 2024 17:14:17 +0200 Subject: [PATCH 07/10] Bump jgit --- spring-rewrite-commons-utils/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-rewrite-commons-utils/pom.xml b/spring-rewrite-commons-utils/pom.xml index b41217f7..cf494d18 100644 --- a/spring-rewrite-commons-utils/pom.xml +++ b/spring-rewrite-commons-utils/pom.xml @@ -22,7 +22,7 @@ org.eclipse.jgit org.eclipse.jgit - 5.13.3.202401111512-r + 6.10.0.202406032230-r From 3b3b5c6e719f9b735b97023c39061a1436639185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= Date: Mon, 1 Jul 2024 17:14:19 +0200 Subject: [PATCH 08/10] Bump junit-pioneer --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 892f7e99..ce8d37bc 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 1.9.13 3.5.3 1.8 - 2.1.0 + 2.2.0 0.0.4 From dc1d6d0b11efe760ff6a5da6c306de64ccfd6398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= Date: Mon, 1 Jul 2024 18:21:18 +0200 Subject: [PATCH 09/10] Remove property managed in parent --- .../spring-rewrite-commons-starter-boot-upgrade/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-rewrite-commons-starters/spring-rewrite-commons-starter-boot-upgrade/pom.xml b/spring-rewrite-commons-starters/spring-rewrite-commons-starter-boot-upgrade/pom.xml index 666b3f5e..c6363362 100644 --- a/spring-rewrite-commons-starters/spring-rewrite-commons-starter-boot-upgrade/pom.xml +++ b/spring-rewrite-commons-starters/spring-rewrite-commons-starter-boot-upgrade/pom.xml @@ -16,7 +16,6 @@ 17 17 UTF-8 - 2.6.2 From 5788ec0f85f6daf7666d95acc763343345abfa9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= Date: Tue, 2 Jul 2024 19:34:14 +0200 Subject: [PATCH 10/10] Polish --- .../org/springframework/sbm/PrivateArtifactRepositoryTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java index 96270f9b..c1bfb932 100644 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java +++ b/spring-rewrite-commons-functional-tests/private-artifact-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()); }