(groovy) branch master updated: GROOVY-11819: Bump spock to 2.4-groovy-5.0 (test dependency)

[paulk]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 5f25a97b7b GROOVY-11819: Bump spock to 2.4-groovy-5.0 (test dependency)
5f25a97b7b is described below

commit 5f25a97b7b89c2e00f0343cd4500e9ae1b2ef6fe
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Dec 17 15:37:21 2025 +1000

    GROOVY-11819: Bump spock to 2.4-groovy-5.0 (test dependency)
---
 .../groovy/transform/traitx/TraitASTTransformationTest.groovy         | 2 +-
 subprojects/groovy-contracts/build.gradle                             | 2 +-
 subprojects/groovy-nio/build.gradle                                   | 2 +-
 subprojects/groovy-templates/build.gradle                             | 2 +-
 subprojects/groovy-xml/build.gradle                                   | 2 +-
 versions.properties                                                   | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/src/test/groovy/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
 
b/src/test/groovy/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
index 524de6f24c..30b9a5973f 100644
--- 
a/src/test/groovy/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
+++ 
b/src/test/groovy/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
@@ -3330,7 +3330,7 @@ final class TraitASTTransformationTest {
 
         
System.setProperty('spock.iKnowWhatImDoing.disableGroovyVersionCheck','true')
         assertScript shell, """
-            @Grab('org.spockframework:spock-core:2.4-M7-groovy-5.0')
+            @Grab('org.spockframework:spock-core:2.4-groovy-5.0')
             @GrabExclude('org.apache.groovy:*')
             import spock.lang.Specification
 
diff --git a/subprojects/groovy-contracts/build.gradle 
b/subprojects/groovy-contracts/build.gradle
index 292b1863fa..0c298d293a 100644
--- a/subprojects/groovy-contracts/build.gradle
+++ b/subprojects/groovy-contracts/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     testImplementation projects.groovyTest
     testImplementation projects.groovyTemplates
     testImplementation "org.spockframework:spock-junit4:${versions.spock}", {
-        exclude group: 'org.codehaus.groovy'
+        exclude group: 'org.apache.groovy'
     }
 }
 
diff --git a/subprojects/groovy-nio/build.gradle 
b/subprojects/groovy-nio/build.gradle
index dadbb719ee..870e76acdb 100644
--- a/subprojects/groovy-nio/build.gradle
+++ b/subprojects/groovy-nio/build.gradle
@@ -25,7 +25,7 @@ dependencies {
 
     testImplementation projects.groovyTest
     testImplementation("org.spockframework:spock-core:${versions.spock}") {
-        exclude group: 'org.codehaus.groovy'
+        exclude group: 'org.apache.groovy'
     }
 }
 
diff --git a/subprojects/groovy-templates/build.gradle 
b/subprojects/groovy-templates/build.gradle
index 2440adc064..e3064f1d55 100644
--- a/subprojects/groovy-templates/build.gradle
+++ b/subprojects/groovy-templates/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     implementation projects.groovyXml
     testImplementation projects.groovyTest
     testImplementation ("org.spockframework:spock-core:${versions.spock}") {
-        exclude group: 'org.codehaus.groovy'
+        exclude group: 'org.apache.groovy'
     }
 }
 
diff --git a/subprojects/groovy-xml/build.gradle 
b/subprojects/groovy-xml/build.gradle
index facfc7d69f..2869f9f666 100644
--- a/subprojects/groovy-xml/build.gradle
+++ b/subprojects/groovy-xml/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     testImplementation projects.groovyTest
     testImplementation "xmlunit:xmlunit:${versions.xmlunit}"
     testImplementation("org.spockframework:spock-core:${versions.spock}") {
-        exclude group: 'org.codehaus.groovy'
+        exclude group: 'org.apache.groovy'
     }
 
     testRuntimeOnly projects.groovyAnt // for JavadocAssertionTests
diff --git a/versions.properties b/versions.properties
index ac1c1b5875..a9b8941fe0 100644
--- a/versions.properties
+++ b/versions.properties
@@ -52,8 +52,8 @@ openbeans=1.0.2
 picocli=4.7.7
 qdox=2.2.0
 slf4j=2.0.17
-# running with Groovy 5 can be allowed with 
-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true
-spock=2.3-groovy-4.0
+# running with Groovy 6 can be allowed with 
-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true
+spock=2.4-groovy-5.0
 spotbugs=4.9.8
 treelayout=1.0.3
 xmlunit=1.6