From 6ba5a30084f9286602b0ec37174f60b84c05655c Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 29 Oct 2025 18:34:53 +0100 Subject: [PATCH 1/5] Drop launcher from rewrite-test, as it's now set in the build plugin This makes for a lighter `rewrite-test` when used by Maven projects. --- rewrite-gradle-tooling-model/model/build.gradle.kts | 5 ----- .../openrewrite/gradle/toolingapi/OpenRewriteModelImpl.java | 2 +- rewrite-test/build.gradle.kts | 4 +--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/rewrite-gradle-tooling-model/model/build.gradle.kts b/rewrite-gradle-tooling-model/model/build.gradle.kts index 5dc1857555..49913559ef 100644 --- a/rewrite-gradle-tooling-model/model/build.gradle.kts +++ b/rewrite-gradle-tooling-model/model/build.gradle.kts @@ -40,11 +40,6 @@ dependencies { testImplementation("com.fasterxml.jackson.core:jackson-databind") testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-smile") - testImplementation("org.assertj:assertj-core:3.+") - testImplementation(platform("org.junit:junit-bom:5.13.3")) - testImplementation("org.junit.jupiter:junit-jupiter-api") - testImplementation("org.junit.jupiter:junit-jupiter-params") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") "pluginLocalTestClasspath"(project(":rewrite-gradle-tooling-model:plugin")) } diff --git a/rewrite-gradle-tooling-model/model/src/main/java/org/openrewrite/gradle/toolingapi/OpenRewriteModelImpl.java b/rewrite-gradle-tooling-model/model/src/main/java/org/openrewrite/gradle/toolingapi/OpenRewriteModelImpl.java index bd82fd7724..a3307a287d 100644 --- a/rewrite-gradle-tooling-model/model/src/main/java/org/openrewrite/gradle/toolingapi/OpenRewriteModelImpl.java +++ b/rewrite-gradle-tooling-model/model/src/main/java/org/openrewrite/gradle/toolingapi/OpenRewriteModelImpl.java @@ -21,7 +21,7 @@ import java.io.Serializable; @Value -public class OpenRewriteModelImpl implements Serializable { +public class OpenRewriteModelImpl implements OpenRewriteModelProxy, Serializable { byte[] gradleProjectBytes; byte @Nullable [] gradleSettingsBytes; diff --git a/rewrite-test/build.gradle.kts b/rewrite-test/build.gradle.kts index d7013115e4..6927438f18 100644 --- a/rewrite-test/build.gradle.kts +++ b/rewrite-test/build.gradle.kts @@ -3,12 +3,11 @@ plugins { } dependencies { - api(platform("org.junit:junit-bom:5.13.3")) + api(platform("org.junit:junit-bom:5.14.0")) api(project(":rewrite-core")) compileOnly("io.micrometer:micrometer-core:latest.release") api("org.junit.jupiter:junit-jupiter-api") api("org.junit.jupiter:junit-jupiter-params") - api("org.junit.platform:junit-platform-launcher") implementation("org.assertj:assertj-core:3.+") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-csv") @@ -17,5 +16,4 @@ dependencies { testImplementation(project(":rewrite-groovy")) testRuntimeOnly("org.antlr:antlr4-runtime:4.13.2") - testRuntimeOnly(project(":rewrite-java-25")) } From dd8dfa398e489edfc0064994b06a9a38ebdcd429 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 29 Oct 2025 18:47:11 +0100 Subject: [PATCH 2/5] Have `rewrite-javascript` depend on `rewrite-java-21` for toolchain default --- rewrite-javascript/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rewrite-javascript/build.gradle.kts b/rewrite-javascript/build.gradle.kts index 983b108af3..88fc18933e 100644 --- a/rewrite-javascript/build.gradle.kts +++ b/rewrite-javascript/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { testImplementation(project(":rewrite-test")) testImplementation(project(":rewrite-yaml")) testImplementation("io.moderne:jsonrpc:latest.integration") - testRuntimeOnly(project(":rewrite-java-25")) + testRuntimeOnly(project(":rewrite-java-21")) } tasks.withType().configureEach { From 5ebbe6774543aaae8af31f8946c34ffd326b2d55 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 29 Oct 2025 18:53:34 +0100 Subject: [PATCH 3/5] Use `rewrite-java-21` in more places to align with toolchain usage --- rewrite-benchmarks/build.gradle.kts | 2 +- rewrite-java-tck/build.gradle.kts | 2 +- rewrite-maven/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rewrite-benchmarks/build.gradle.kts b/rewrite-benchmarks/build.gradle.kts index ea8d78ac92..f214282f1f 100644 --- a/rewrite-benchmarks/build.gradle.kts +++ b/rewrite-benchmarks/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { jmh(project(":rewrite-core")) jmh(project(":rewrite-java")) - jmh(project(":rewrite-java-25")) + jmh(project(":rewrite-java-21")) jmh(project(":rewrite-maven")) jmh("org.antlr:antlr4-runtime:4.13.2") jmh("org.rocksdb:rocksdbjni:10.2.1") diff --git a/rewrite-java-tck/build.gradle.kts b/rewrite-java-tck/build.gradle.kts index 9b02f6423d..0c3bf70b2d 100644 --- a/rewrite-java-tck/build.gradle.kts +++ b/rewrite-java-tck/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { if (System.getProperty("idea.active") != null || System.getProperty("idea.sync.active") != null) { // so we can run tests in the IDE with the IntelliJ IDEA runner - runtimeOnly(project(":rewrite-java-25")) + runtimeOnly(project(":rewrite-java-21")) } } diff --git a/rewrite-maven/build.gradle.kts b/rewrite-maven/build.gradle.kts index cee711c4f6..3ab9c55c79 100755 --- a/rewrite-maven/build.gradle.kts +++ b/rewrite-maven/build.gradle.kts @@ -43,7 +43,7 @@ dependencies { testImplementation("org.mapdb:mapdb:latest.release") testRuntimeOnly("org.mapdb:mapdb:latest.release") - testRuntimeOnly(project(":rewrite-java-25")) + testRuntimeOnly(project(":rewrite-java-21")) testRuntimeOnly("org.rocksdb:rocksdbjni:10.2.1") } From 679a9354902c77a3531aa08b0e0f19da9482f9c5 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 29 Oct 2025 18:58:53 +0100 Subject: [PATCH 4/5] Fix a dangling reference in rewrite-javascript integration tests --- rewrite-javascript/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rewrite-javascript/build.gradle.kts b/rewrite-javascript/build.gradle.kts index 88fc18933e..f106a1b303 100644 --- a/rewrite-javascript/build.gradle.kts +++ b/rewrite-javascript/build.gradle.kts @@ -176,7 +176,7 @@ testing { dependencies { implementation(project()) - implementation(project(":rewrite-java-25")) + implementation(project(":rewrite-java-21")) implementation(project(":rewrite-test")) implementation(project(":rewrite-json")) implementation(project(":rewrite-java-tck")) From ba7be7e58cbe3e39c72eabd350c0a7656dd09413 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 29 Oct 2025 19:53:30 +0100 Subject: [PATCH 5/5] Drop the one test that required rewrite-java-2x --- .../test/internal/RewriteTestTest.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/rewrite-test/src/test/java/org/openrewrite/test/internal/RewriteTestTest.java b/rewrite-test/src/test/java/org/openrewrite/test/internal/RewriteTestTest.java index 3a77221231..749797726e 100644 --- a/rewrite-test/src/test/java/org/openrewrite/test/internal/RewriteTestTest.java +++ b/rewrite-test/src/test/java/org/openrewrite/test/internal/RewriteTestTest.java @@ -34,7 +34,6 @@ import static java.util.Collections.emptyList; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.openrewrite.java.Assertions.java; import static org.openrewrite.test.SourceSpecs.text; @SuppressWarnings("UnnecessarySemicolon") @@ -141,21 +140,6 @@ void allowScannerEdit() { text("foo") ); } - - @Test - void allowNonWhitespaceInWhitespace() { - rewriteRun( - spec -> spec.typeValidationOptions(TypeValidation.all().allowNonWhitespaceInWhitespace(true)), - java( - """ - import java.util.List;; - interface A { - List getList(); - } - """ - ) - ); - } } @EqualsAndHashCode(callSuper = false)