This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_5_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit be211c1b142eedde02d0c16fb57f99ed23110de2 Author: Paul King <[email protected]> AuthorDate: Wed Dec 17 12:32:56 2025 +1000 GROOVY-11819: Bump spock to 2.4-groovy-5.0 (test dependency) --- .../codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy | 2 +- subprojects/groovy-contracts/build.gradle | 3 +-- subprojects/groovy-nio/build.gradle | 3 +-- subprojects/groovy-templates/build.gradle | 3 +-- subprojects/groovy-xml/build.gradle | 3 +-- 5 files changed, 5 insertions(+), 9 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 a57485deea..a20c020d71 100644 --- a/src/test/groovy/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy +++ b/src/test/groovy/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy @@ -3329,7 +3329,7 @@ final class TraitASTTransformationTest { """ 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..a32bc62b48 100644 --- a/subprojects/groovy-contracts/build.gradle +++ b/subprojects/groovy-contracts/build.gradle @@ -27,13 +27,12 @@ dependencies { testImplementation projects.groovyTest testImplementation projects.groovyTemplates testImplementation "org.spockframework:spock-junit4:${versions.spock}", { - exclude group: 'org.codehaus.groovy' + exclude group: 'org.apache.groovy' } } tasks.named('test') { useJUnitPlatform() - systemProperty 'spock.iKnowWhatImDoing.disableGroovyVersionCheck', 'true' } groovyLibrary { diff --git a/subprojects/groovy-nio/build.gradle b/subprojects/groovy-nio/build.gradle index dadbb719ee..01b7de923d 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' } } @@ -37,5 +37,4 @@ groovyLibrary { tasks.named('test') { useJUnitPlatform() - systemProperty 'spock.iKnowWhatImDoing.disableGroovyVersionCheck', 'true' } diff --git a/subprojects/groovy-templates/build.gradle b/subprojects/groovy-templates/build.gradle index 2440adc064..751c9b2d53 100644 --- a/subprojects/groovy-templates/build.gradle +++ b/subprojects/groovy-templates/build.gradle @@ -25,13 +25,12 @@ dependencies { implementation projects.groovyXml testImplementation projects.groovyTest testImplementation ("org.spockframework:spock-core:${versions.spock}") { - exclude group: 'org.codehaus.groovy' + exclude group: 'org.apache.groovy' } } tasks.named('test') { useJUnitPlatform() - systemProperty "spock.iKnowWhatImDoing.disableGroovyVersionCheck", "true" } tasks.named('rat') { diff --git a/subprojects/groovy-xml/build.gradle b/subprojects/groovy-xml/build.gradle index facfc7d69f..e4bfdff820 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 @@ -46,7 +46,6 @@ plugins.withId('eclipse') { tasks.named('test') { useJUnitPlatform() - systemProperty 'spock.iKnowWhatImDoing.disableGroovyVersionCheck', 'true' } groovyLibrary {
