From 4ded5aa83f01e636abe73ffe4fd5313a21cf79ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Jan 2026 19:03:25 +0000 Subject: [PATCH 1/2] Bump org.spockframework:spock-core in /test-project-groovy Bumps [org.spockframework:spock-core](https://github.com/spockframework/spock) from 2.4-M1-groovy-3.0 to 2.4-groovy-5.0. - [Release notes](https://github.com/spockframework/spock/releases) - [Changelog](https://github.com/spockframework/spock/blob/master/docs/release_notes.adoc) - [Commits](https://github.com/spockframework/spock/commits) --- updated-dependencies: - dependency-name: org.spockframework:spock-core dependency-version: 2.4-groovy-5.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- test-project-groovy/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-project-groovy/build.gradle b/test-project-groovy/build.gradle index d691b3b..7d45cc9 100644 --- a/test-project-groovy/build.gradle +++ b/test-project-groovy/build.gradle @@ -31,7 +31,7 @@ subprojects { testImplementation "org.junit.jupiter:junit-jupiter-params:$jUnitVersion" testImplementation "org.junit.jupiter:junit-jupiter-engine:$jUnitVersion" testRuntimeOnly "org.junit.platform:junit-platform-launcher:$jUnitPlatformVersion" - testImplementation("org.spockframework:spock-core:2.4-M1-groovy-3.0") { + testImplementation("org.spockframework:spock-core:2.4-groovy-5.0") { exclude module: 'groovy-nio' exclude module: 'groovy-test' exclude module: 'groovy-xml' From b1da1f4f4687ef170170c864fe107397bb6f70d0 Mon Sep 17 00:00:00 2001 From: GitHub Copilot Date: Fri, 24 Apr 2026 13:26:49 +0100 Subject: [PATCH 2/2] Fix compatibility with Spock 2.4-groovy-5.0 Spock 2.4-groovy-5.0 depends on Groovy 5.x, which changed its Maven group ID from org.codehaus.groovy to org.apache.groovy, and its JPMS module name from org.codehaus.groovy to org.apache.groovy. Update test-project-groovy accordingly: - build.gradle: use org.apache.groovy:groovy:5.0.3 - module-info.java: requires org.apache.groovy (all subprojects) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- test-project-groovy/build.gradle | 2 +- test-project-groovy/greeter.api/src/main/java/module-info.java | 2 +- .../greeter.javaexec/src/main/java/module-info.java | 2 +- .../greeter.provider.test/src/main/java/module-info.java | 2 +- .../greeter.provider.testfixture/src/main/java/module-info.java | 2 +- .../greeter.provider/src/main/java/module-info.java | 2 +- .../greeter.runner/src/main/java/module-info.java | 2 +- .../greeter.startscripts/src/main/java/module-info.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test-project-groovy/build.gradle b/test-project-groovy/build.gradle index 7d45cc9..5c81599 100644 --- a/test-project-groovy/build.gradle +++ b/test-project-groovy/build.gradle @@ -26,7 +26,7 @@ subprojects { } dependencies { - implementation 'org.codehaus.groovy:groovy:3.0.25' + implementation 'org.apache.groovy:groovy:5.0.3' testImplementation "org.junit.jupiter:junit-jupiter-api:$jUnitVersion" testImplementation "org.junit.jupiter:junit-jupiter-params:$jUnitVersion" testImplementation "org.junit.jupiter:junit-jupiter-engine:$jUnitVersion" diff --git a/test-project-groovy/greeter.api/src/main/java/module-info.java b/test-project-groovy/greeter.api/src/main/java/module-info.java index 08f6840..dbecbb1 100644 --- a/test-project-groovy/greeter.api/src/main/java/module-info.java +++ b/test-project-groovy/greeter.api/src/main/java/module-info.java @@ -1,5 +1,5 @@ module greeter.api { exports examples.greeter.api; - requires org.codehaus.groovy; + requires org.apache.groovy; } \ No newline at end of file diff --git a/test-project-groovy/greeter.javaexec/src/main/java/module-info.java b/test-project-groovy/greeter.javaexec/src/main/java/module-info.java index f5c7b99..db768e7 100644 --- a/test-project-groovy/greeter.javaexec/src/main/java/module-info.java +++ b/test-project-groovy/greeter.javaexec/src/main/java/module-info.java @@ -2,7 +2,7 @@ module greeter.javaexec { requires greeter.api; - requires org.codehaus.groovy; + requires org.apache.groovy; exports demo; uses Greeter; diff --git a/test-project-groovy/greeter.provider.test/src/main/java/module-info.java b/test-project-groovy/greeter.provider.test/src/main/java/module-info.java index 1ec1946..13412a9 100644 --- a/test-project-groovy/greeter.provider.test/src/main/java/module-info.java +++ b/test-project-groovy/greeter.provider.test/src/main/java/module-info.java @@ -2,7 +2,7 @@ module greeter.provider.test { requires greeter.api; - requires org.codehaus.groovy; + requires org.apache.groovy; exports tests; uses Greeter; diff --git a/test-project-groovy/greeter.provider.testfixture/src/main/java/module-info.java b/test-project-groovy/greeter.provider.testfixture/src/main/java/module-info.java index efea0b7..c76c4be 100644 --- a/test-project-groovy/greeter.provider.testfixture/src/main/java/module-info.java +++ b/test-project-groovy/greeter.provider.testfixture/src/main/java/module-info.java @@ -2,7 +2,7 @@ module greeter.provider.testfixture { requires greeter.api; - requires org.codehaus.groovy; + requires org.apache.groovy; exports testfixture; uses Greeter; diff --git a/test-project-groovy/greeter.provider/src/main/java/module-info.java b/test-project-groovy/greeter.provider/src/main/java/module-info.java index ecdb336..c4a7eed 100644 --- a/test-project-groovy/greeter.provider/src/main/java/module-info.java +++ b/test-project-groovy/greeter.provider/src/main/java/module-info.java @@ -2,7 +2,7 @@ module greeter.provider { requires greeter.api; - requires org.codehaus.groovy; + requires org.apache.groovy; exports examples.greeter; provides Greeter with examples.greeter.Friendly; diff --git a/test-project-groovy/greeter.runner/src/main/java/module-info.java b/test-project-groovy/greeter.runner/src/main/java/module-info.java index e0171a0..2c8a737 100644 --- a/test-project-groovy/greeter.runner/src/main/java/module-info.java +++ b/test-project-groovy/greeter.runner/src/main/java/module-info.java @@ -3,6 +3,6 @@ module greeter.runner { requires greeter.api; - requires org.codehaus.groovy; + requires org.apache.groovy; uses Greeter; } diff --git a/test-project-groovy/greeter.startscripts/src/main/java/module-info.java b/test-project-groovy/greeter.startscripts/src/main/java/module-info.java index a08555a..51c6988 100644 --- a/test-project-groovy/greeter.startscripts/src/main/java/module-info.java +++ b/test-project-groovy/greeter.startscripts/src/main/java/module-info.java @@ -2,7 +2,7 @@ module greeter.startscripts { requires greeter.api; - requires org.codehaus.groovy; + requires org.apache.groovy; exports startscripts; uses Greeter;