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 2020/06/15 14:09:55 UTC
[groovy] 02/02: GROOVY-9593: Switch Spock from SNAPSHOT to
2.0-M3-groovy-3.0 (tweaks)
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
commit ca1c963e1816f7c709f5b5bdbad8b3d9f9635151
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Jun 16 00:09:43 2020 +1000
GROOVY-9593: Switch Spock from SNAPSHOT to 2.0-M3-groovy-3.0 (tweaks)
---
build.gradle | 6 ++----
subprojects/groovy-nio/build.gradle | 6 +-----
subprojects/groovy-templates/build.gradle | 10 +---------
3 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/build.gradle b/build.gradle
index 82034f3..e9e4553 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ buildscript {
maven { url 'https://maven.aliyun.com/nexus/content/groups/public' }
}
jcenter()
- maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+// maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
maven {
url "https://plugins.gradle.org/m2/"
}
@@ -343,9 +343,7 @@ allprojects {
classpath = (classpath != null) ? classpath + groovyClasspath : groovyClasspath
}.configureEach {
options.incremental = true
- if (groovyVersion.startsWith('4')) {
- options.forkOptions.jvmArgs += ["-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true"]
- }
+ options.forkOptions.jvmArgs += ["-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true"]
}
}
diff --git a/subprojects/groovy-nio/build.gradle b/subprojects/groovy-nio/build.gradle
index afb4812..44a7dfa 100644
--- a/subprojects/groovy-nio/build.gradle
+++ b/subprojects/groovy-nio/build.gradle
@@ -16,11 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-repositories {
- maven {
- url 'https://oss.sonatype.org/content/repositories/snapshots'
- }
-}
dependencies {
api rootProject // NioExtensions uses Closure...
@@ -37,6 +32,7 @@ task moduleDescriptor(type: org.codehaus.groovy.gradle.WriteExtensionDescriptorT
test {
useJUnitPlatform()
+ systemProperty "spock.iKnowWhatImDoing.disableGroovyVersionCheck", "true"
}
compileJava.dependsOn moduleDescriptor
diff --git a/subprojects/groovy-templates/build.gradle b/subprojects/groovy-templates/build.gradle
index e318372..658a2bf 100644
--- a/subprojects/groovy-templates/build.gradle
+++ b/subprojects/groovy-templates/build.gradle
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-repositories {
- maven {
- url 'https://oss.sonatype.org/content/repositories/snapshots'
- }
-}
-
dependencies {
api rootProject // Template uses Writable...
implementation project(':groovy-xml')
@@ -37,9 +31,7 @@ dependencies {
test {
useJUnitPlatform()
- if (groovyVersion.startsWith('4')) {
- systemProperty "spock.iKnowWhatImDoing.disableGroovyVersionCheck", "true"
- }
+ systemProperty "spock.iKnowWhatImDoing.disableGroovyVersionCheck", "true"
}
task backportJar(type:Jar) {