You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/09/01 02:43:47 UTC
[groovy] branch GROOVY_4_0_X updated: GROOVY-10738: Bump Spock to 2.2 (test dependency)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
new f3eb86337b GROOVY-10738: Bump Spock to 2.2 (test dependency)
f3eb86337b is described below
commit f3eb86337bb904bd9db2a12ccfcd67aa76324e70
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Sep 1 12:43:39 2022 +1000
GROOVY-10738: Bump Spock to 2.2 (test dependency)
---
buildSrc/src/main/groovy/org.apache.groovy-base.gradle | 6 +-----
subprojects/groovy-contracts/build.gradle | 1 -
subprojects/groovy-nio/build.gradle | 1 -
subprojects/groovy-templates/build.gradle | 3 +--
subprojects/groovy-xml/build.gradle | 1 -
versions.properties | 3 +--
6 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-base.gradle b/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
index 06b3719779..d526e643b4 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
@@ -218,10 +218,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")
@@ -348,4 +344,4 @@ Configuration createConsumableConfiguration(ObjectFactory objects,
}
}
}
-}
\ No newline at end of file
+}
diff --git a/subprojects/groovy-contracts/build.gradle b/subprojects/groovy-contracts/build.gradle
index 54e91e9b05..daffe6ea6a 100644
--- a/subprojects/groovy-contracts/build.gradle
+++ b/subprojects/groovy-contracts/build.gradle
@@ -33,7 +33,6 @@ dependencies {
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 0ed023e105..131f5dead2 100644
--- a/subprojects/groovy-nio/build.gradle
+++ b/subprojects/groovy-nio/build.gradle
@@ -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 0b7ec93e70..2926d22585 100644
--- a/subprojects/groovy-templates/build.gradle
+++ b/subprojects/groovy-templates/build.gradle
@@ -34,7 +34,6 @@ dependencies {
tasks.named('test') {
useJUnitPlatform()
- systemProperty "spock.iKnowWhatImDoing.disableGroovyVersionCheck", "true"
}
tasks.named('rat') {
@@ -44,4 +43,4 @@ tasks.named('rat') {
'src/test/resources/includes/hello-escaped.txt',
'src/test/resources/includes/hello.html'
]
-}
\ No newline at end of file
+}
diff --git a/subprojects/groovy-xml/build.gradle b/subprojects/groovy-xml/build.gradle
index a4dc0fb93e..6b3cb4c3de 100644
--- a/subprojects/groovy-xml/build.gradle
+++ b/subprojects/groovy-xml/build.gradle
@@ -47,7 +47,6 @@ plugins.withId('eclipse') {
tasks.named('test') {
useJUnitPlatform()
- systemProperty 'spock.iKnowWhatImDoing.disableGroovyVersionCheck', 'true'
}
groovyLibrary {
diff --git a/versions.properties b/versions.properties
index 35a62531b4..79cb9b5b14 100644
--- a/versions.properties
+++ b/versions.properties
@@ -46,8 +46,7 @@ qdox=1.12.1
slf4j=1.7.36
xmlunit=1.6
xstream=1.4.19
-# running with Groovy 4 can be allowed with -Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true
-spock=2.1-groovy-3.0
+spock=2.2-groovy-4.0
spotbugs=4.7.1
spotbugsAnnotations=4.7.1
checkstyle=9.3