This is an automated email from the ASF dual-hosted git repository. emilles pushed a commit to branch GROOVY_5_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 7e3e5b012150d0cd9c60f22f5d92bb7df36c2226 Author: Eric Milles <[email protected]> AuthorDate: Wed Nov 26 10:53:22 2025 -0600 `org.spockframework:spock-core:2.4-M7-groovy-5.0` --- build-logic/src/main/groovy/org.apache.groovy-base.gradle | 4 ---- gradle/verification-metadata.xml | 10 ---------- .../groovy/transform/traitx/TraitASTTransformationTest.groovy | 3 +-- .../apache/groovy/contracts/spock/SpockIntegrationTests.groovy | 4 +--- .../groovy/text/StreamingTemplateEngineSpecification.groovy | 4 ++-- versions.properties | 3 +-- 6 files changed, 5 insertions(+), 23 deletions(-) diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle b/build-logic/src/main/groovy/org.apache.groovy-base.gradle index a07154929c..39b5cf938d 100644 --- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle +++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle @@ -226,10 +226,6 @@ tasks.withType(Javadoc).configureEach { options.source = sharedConfiguration.targetJavaVersion.get() } -tasks.named('compileTestGroovy') { - options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true'] -} - tasks.withType(CodeNarc).configureEach { ignoreFailures = true configFile = rootProject.file('config/codenarc/codenarc.groovy') diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 2bf893544f..960579e6ea 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1905,16 +1905,6 @@ <sha512 value="5b947edcb05a1c17648ec9fe53dd2c66b4a86dd2b950d989255f6edd636fd5d50d18b8f31b3a1736dadd9cff6790a3d0355f2ed896c3eb7f72e009199fe9957d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/> </artifact> </component> - <component group="org.spockframework" name="spock-core" version="2.3-groovy-4.0"> - <artifact name="spock-core-2.3-groovy-4.0.jar"> - <sha512 value="67a718b2da6fdc3f64e65e68fa789047b3fe7eb66147b4865e311e4bdf68f821dd6c290261f1db9d9ab0ee3505853bfe5772b94c6c2ca364896c6fc6cc92cedb" origin="Generated by Gradle" reason="A key couldn't be downloaded"/> - </artifact> - </component> - <component group="org.spockframework" name="spock-junit4" version="2.3-groovy-4.0"> - <artifact name="spock-junit4-2.3-groovy-4.0.jar"> - <sha512 value="ab14c5254653e7be75d6e52ef64122242766d005b42c5d8b4366b1a8557fca9e1629c79f66bf5cfc6031904c756cf84ec04ba5bcf0593ec69a58a3f2ab5a3dde" origin="Generated by Gradle" reason="A key couldn't be downloaded"/> - </artifact> - </component> <component group="org.testng" name="testng" version="7.11.0"> <artifact name="testng-7.11.0.jar"> <pgp value="C4F54D8622C95CC3F098721A0F13D5631D6AF36D"/> 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 194d8fbf22..a57485deea 100644 --- a/src/test/groovy/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy +++ b/src/test/groovy/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy @@ -3328,9 +3328,8 @@ final class TraitASTTransformationTest { assert td == 'm(java.lang.Class,[java.lang.Object):java.lang.Object' """ - System.setProperty('spock.iKnowWhatImDoing.disableGroovyVersionCheck','true') assertScript shell, """ - @Grab('org.spockframework:spock-core:2.4-M6-groovy-4.0') + @Grab('org.spockframework:spock-core:2.4-M7-groovy-5.0') @GrabExclude('org.apache.groovy:*') import spock.lang.Specification diff --git a/subprojects/groovy-contracts/src/test/groovy/org/apache/groovy/contracts/spock/SpockIntegrationTests.groovy b/subprojects/groovy-contracts/src/test/groovy/org/apache/groovy/contracts/spock/SpockIntegrationTests.groovy index e56e3dc6c6..47b376cc57 100644 --- a/subprojects/groovy-contracts/src/test/groovy/org/apache/groovy/contracts/spock/SpockIntegrationTests.groovy +++ b/subprojects/groovy-contracts/src/test/groovy/org/apache/groovy/contracts/spock/SpockIntegrationTests.groovy @@ -18,17 +18,15 @@ */ package org.apache.groovy.contracts.spock -import spock.lang.Specification import groovy.contracts.Requires import org.apache.groovy.contracts.PreconditionViolation -final class ContractsSpec extends Specification { +final class ContractsSpec extends spock.lang.Specification { @Requires({ dir && file && path }) private contractedMethod(String dir, String file, String path) { } - @spock.lang.Ignore // until Spock fixes thrown def "contracted method with precondition violation"(String dir, String file, String path) { when: contractedMethod(dir, file, path) diff --git a/subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineSpecification.groovy b/subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineSpecification.groovy index f21ea09297..1eda92798e 100644 --- a/subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineSpecification.groovy +++ b/subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineSpecification.groovy @@ -252,7 +252,7 @@ class StreamingTemplateEngineSpecification extends Specification { then: streaming == gString } -/* + def "should throw exception with correct line number on template execution error in mid template"() { setup: def binding = [firstname : "Grace", @@ -391,7 +391,7 @@ class StreamingTemplateEngineSpecification extends Specification { def e = thrown(TemplateParseException) e.lineNumber == 7 } -*/ + @Unroll def "should evaluate adjacent expressions '#expression' to '#expected'"() { expect: diff --git a/versions.properties b/versions.properties index e8e6c2d25f..7210a3a654 100644 --- a/versions.properties +++ b/versions.properties @@ -52,8 +52,7 @@ 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 +spock=2.4-M7-groovy-5.0 spotbugs=4.9.8 treelayout=1.0.3 xmlunit=1.6
