From a24cda96092a3eb77f75edd4f11d1f6925fb065a Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Mon, 23 Dec 2024 11:58:33 +0000 Subject: [PATCH 01/11] Add Maven profile for debugging ITs automatically --- java-compiler-testing/pom.xml | 20 +++++++++++++++++++ .../src/it/invoker-debug.properties | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 java-compiler-testing/src/it/invoker-debug.properties diff --git a/java-compiler-testing/pom.xml b/java-compiler-testing/pom.xml index 6cb077019..a4b9e12aa 100644 --- a/java-compiler-testing/pom.xml +++ b/java-compiler-testing/pom.xml @@ -195,4 +195,24 @@ + + + + invoker-debug + + + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven-invoker-plugin.version} + + invoker-debug.properties + + + + + + + diff --git a/java-compiler-testing/src/it/invoker-debug.properties b/java-compiler-testing/src/it/invoker-debug.properties new file mode 100644 index 000000000..89292705f --- /dev/null +++ b/java-compiler-testing/src/it/invoker-debug.properties @@ -0,0 +1,3 @@ +invoker.mavenOpts = -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5005 +invoker.quiet = false +invoker.timeoutInSeconds = 0 From 81c06392245de86fad68a3bc965b685c706c3f15 Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:00:10 +0000 Subject: [PATCH 02/11] Update avaje-http to 2.8 --- java-compiler-testing/src/it/avaje-http/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-compiler-testing/src/it/avaje-http/pom.xml b/java-compiler-testing/src/it/avaje-http/pom.xml index 334de85c7..0b9a72378 100644 --- a/java-compiler-testing/src/it/avaje-http/pom.xml +++ b/java-compiler-testing/src/it/avaje-http/pom.xml @@ -31,7 +31,7 @@ Acceptance tests for Avaje HTTP. - 2.4 + 2.8 From 1e206a25b3347b70414f62a870fc9ff1934e32f9 Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:05:30 +0000 Subject: [PATCH 03/11] Update avaje-inject to 11.0 --- java-compiler-testing/src/it/avaje-inject/pom.xml | 2 +- .../jct/acceptancetests/avajeinject/AvajeInjectTest.java | 3 ++- .../it/avaje-inject/src/test/resources/code/module-info.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java-compiler-testing/src/it/avaje-inject/pom.xml b/java-compiler-testing/src/it/avaje-inject/pom.xml index 6e3caede9..c5e2e5d6a 100644 --- a/java-compiler-testing/src/it/avaje-inject/pom.xml +++ b/java-compiler-testing/src/it/avaje-inject/pom.xml @@ -31,7 +31,7 @@ Acceptance tests for Avaje Inject. - 9.12 + 11.0 diff --git a/java-compiler-testing/src/it/avaje-inject/src/test/java/io/github/ascopes/jct/acceptancetests/avajeinject/AvajeInjectTest.java b/java-compiler-testing/src/it/avaje-inject/src/test/java/io/github/ascopes/jct/acceptancetests/avajeinject/AvajeInjectTest.java index bbf4c5af6..3acaff1c1 100644 --- a/java-compiler-testing/src/it/avaje-inject/src/test/java/io/github/ascopes/jct/acceptancetests/avajeinject/AvajeInjectTest.java +++ b/java-compiler-testing/src/it/avaje-inject/src/test/java/io/github/ascopes/jct/acceptancetests/avajeinject/AvajeInjectTest.java @@ -19,6 +19,7 @@ import io.github.ascopes.jct.compilers.JctCompiler; import io.github.ascopes.jct.junit.JavacCompilerTest; +import io.github.ascopes.jct.workspaces.PathStrategy; import io.github.ascopes.jct.workspaces.Workspaces; import org.junit.jupiter.api.DisplayName; @@ -29,7 +30,7 @@ class AvajeInjectTest { @JavacCompilerTest(minVersion = 11) void dependencyInjectionCodeGetsGeneratedAsExpected(JctCompiler compiler) { // Given - try (var workspace = Workspaces.newWorkspace()) { + try (var workspace = Workspaces.newWorkspace(PathStrategy.TEMP_DIRECTORIES)) { workspace .createSourcePathPackage() .copyContentsFrom("src", "test", "resources", "code"); diff --git a/java-compiler-testing/src/it/avaje-inject/src/test/resources/code/module-info.java b/java-compiler-testing/src/it/avaje-inject/src/test/resources/code/module-info.java index eba8a3b0f..78bd8d8e7 100644 --- a/java-compiler-testing/src/it/avaje-inject/src/test/resources/code/module-info.java +++ b/java-compiler-testing/src/it/avaje-inject/src/test/resources/code/module-info.java @@ -18,5 +18,5 @@ requires io.avaje.inject; - provides io.avaje.inject.spi.Module with org.example.ExampleModule; + provides io.avaje.inject.spi.AvajeModule with org.example.ExampleModule; } From 0c004188787c3d07042ff399e7728748c6edffe2 Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:32:26 +0000 Subject: [PATCH 04/11] Update invoker debug properties --- java-compiler-testing/src/it/invoker-debug.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-compiler-testing/src/it/invoker-debug.properties b/java-compiler-testing/src/it/invoker-debug.properties index 89292705f..37d5de10a 100644 --- a/java-compiler-testing/src/it/invoker-debug.properties +++ b/java-compiler-testing/src/it/invoker-debug.properties @@ -1,3 +1,3 @@ -invoker.mavenOpts = -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5005 +invoker.mavenOpts = -Dmaven.surefire.debug="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5005" -Dmaven.failsafe.debug="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5005" invoker.quiet = false invoker.timeoutInSeconds = 0 From 267ed5747f92d75411a7b7bfc029630032390449 Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:34:43 +0000 Subject: [PATCH 05/11] Update dagger to 2.54 --- java-compiler-testing/src/it/dagger/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-compiler-testing/src/it/dagger/pom.xml b/java-compiler-testing/src/it/dagger/pom.xml index 9737b4cd0..d1591c6ad 100644 --- a/java-compiler-testing/src/it/dagger/pom.xml +++ b/java-compiler-testing/src/it/dagger/pom.xml @@ -31,7 +31,7 @@ Acceptance tests for Google Dagger. - 2.51.1 + 2.54 From 65dd7e344204ec9ff17dc4e8cb40d26abaf40edd Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:35:51 +0000 Subject: [PATCH 06/11] Update google auto to 1.11.0 --- java-compiler-testing/src/it/google-auto-value/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-compiler-testing/src/it/google-auto-value/pom.xml b/java-compiler-testing/src/it/google-auto-value/pom.xml index 77c918281..27ad7a9e6 100644 --- a/java-compiler-testing/src/it/google-auto-value/pom.xml +++ b/java-compiler-testing/src/it/google-auto-value/pom.xml @@ -31,7 +31,7 @@ Acceptance tests for Google AutoValue. - 1.10.4 + 1.11.0 From 7514e65cab0497faf3aee331cb76b6e1a184e3cb Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:39:11 +0000 Subject: [PATCH 07/11] Update error-prone to 2.36.0 --- .../src/it/google-error-prone/pom.xml | 2 +- .../acceptancetests/errorprone/ErrorProneTest.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/java-compiler-testing/src/it/google-error-prone/pom.xml b/java-compiler-testing/src/it/google-error-prone/pom.xml index a79f26f23..22170bca0 100644 --- a/java-compiler-testing/src/it/google-error-prone/pom.xml +++ b/java-compiler-testing/src/it/google-error-prone/pom.xml @@ -50,7 +50,7 @@ -DmvnArgLinePropagated=true - 2.28.0 + 2.36.0 diff --git a/java-compiler-testing/src/it/google-error-prone/src/test/java/io/github/ascopes/jct/acceptancetests/errorprone/ErrorProneTest.java b/java-compiler-testing/src/it/google-error-prone/src/test/java/io/github/ascopes/jct/acceptancetests/errorprone/ErrorProneTest.java index b04721830..34cc39bd3 100644 --- a/java-compiler-testing/src/it/google-error-prone/src/test/java/io/github/ascopes/jct/acceptancetests/errorprone/ErrorProneTest.java +++ b/java-compiler-testing/src/it/google-error-prone/src/test/java/io/github/ascopes/jct/acceptancetests/errorprone/ErrorProneTest.java @@ -56,7 +56,11 @@ void happyPathsWorkAsExpected(JctCompiler compiler) { // When var compilation = compiler - .addCompilerOptions("-Xplugin:ErrorProne", "-XDcompilePolicy=simple") + .addCompilerOptions( + "-Xplugin:ErrorProne", + "-XDcompilePolicy=simple", + "--should-stop=ifError=FLOW" + ) .compile(workspace); // Then @@ -74,7 +78,11 @@ void sadPathsFailAsExpected(JctCompiler compiler) { // When var compilation = compiler - .addCompilerOptions("-Xplugin:ErrorProne", "-XDcompilePolicy=simple") + .addCompilerOptions( + "-Xplugin:ErrorProne", + "-XDcompilePolicy=simple", + "--should-stop=ifError=FLOW" + ) .compile(workspace); // Then From 7ef2f74478171d2a2e65c37d55c81b2e5a922001 Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:39:58 +0000 Subject: [PATCH 08/11] Update lombok to 1.18.36 --- java-compiler-testing/src/it/lombok/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-compiler-testing/src/it/lombok/pom.xml b/java-compiler-testing/src/it/lombok/pom.xml index 8080e79da..e7b8326c9 100644 --- a/java-compiler-testing/src/it/lombok/pom.xml +++ b/java-compiler-testing/src/it/lombok/pom.xml @@ -31,7 +31,7 @@ Acceptance tests for Lombok. - 1.18.32 + 1.18.36 From 7a90fb851b4b2c3212919ec48b095f9a6d62a111 Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:40:46 +0000 Subject: [PATCH 09/11] Update mapstruct to 1.6.3 --- java-compiler-testing/src/it/mapstruct/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-compiler-testing/src/it/mapstruct/pom.xml b/java-compiler-testing/src/it/mapstruct/pom.xml index 4dbc692c5..d04dc41f4 100644 --- a/java-compiler-testing/src/it/mapstruct/pom.xml +++ b/java-compiler-testing/src/it/mapstruct/pom.xml @@ -31,7 +31,7 @@ Acceptance tests for MapStruct. - 1.5.5.Final + 1.6.3 From 4bb93f4178f421680baeaea735efe73a2c2bce01 Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:44:12 +0000 Subject: [PATCH 10/11] Update micronaut to 4.7.9 --- .../src/it/micronaut/pom.xml | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/java-compiler-testing/src/it/micronaut/pom.xml b/java-compiler-testing/src/it/micronaut/pom.xml index c313b603f..7ccc3d788 100644 --- a/java-compiler-testing/src/it/micronaut/pom.xml +++ b/java-compiler-testing/src/it/micronaut/pom.xml @@ -31,21 +31,9 @@ Acceptance tests for Micronaut. - 3.10.4 + 4.7.9 - - - - io.micronaut - micronaut-bom - ${micronaut-bom.version} - import - pom - - - - @project.groupId@ @@ -57,21 +45,19 @@ io.micronaut micronaut-http-server-netty + ${micronaut.version} io.micronaut micronaut-inject + ${micronaut.version} io.micronaut micronaut-inject-java - - - - jakarta.annotation - jakarta.annotation-api + ${micronaut.version} From 9528f50d9cb005dabed352aed5a0d90209a55faa Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:45:06 +0000 Subject: [PATCH 11/11] Update spring-boot to 3.4.1 --- java-compiler-testing/src/it/spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-compiler-testing/src/it/spring/pom.xml b/java-compiler-testing/src/it/spring/pom.xml index 464e902cd..7501faf44 100644 --- a/java-compiler-testing/src/it/spring/pom.xml +++ b/java-compiler-testing/src/it/spring/pom.xml @@ -31,7 +31,7 @@ Acceptance tests for Spring Framework. - 3.3.0 + 3.4.1