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:53 UTC
[groovy] branch master updated (0e36e80 -> ca1c963)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 0e36e80 minor refactor: eliminate dup code for getting setter name
new f7ad2d9 GROOVY-9593: Switch Spock from SNAPSHOT to 2.0-M3-groovy-3.0 (closes #1281)
new ca1c963 GROOVY-9593: Switch Spock from SNAPSHOT to 2.0-M3-groovy-3.0 (tweaks)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 5 +++--
subprojects/groovy-nio/build.gradle | 6 +-----
subprojects/groovy-templates/build.gradle | 9 ++-------
3 files changed, 6 insertions(+), 14 deletions(-)
[groovy] 02/02: GROOVY-9593: Switch Spock from SNAPSHOT to
2.0-M3-groovy-3.0 (tweaks)
Posted by pa...@apache.org.
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) {
[groovy] 01/02: GROOVY-9593: Switch Spock from SNAPSHOT to
2.0-M3-groovy-3.0 (closes #1281)
Posted by pa...@apache.org.
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 f7ad2d9e1903cc9626adf92cf4e0d9dc329f88e7
Author: Marcin Zajączkowski <sz...@users.sourceforge.net>
AuthorDate: Mon Jun 15 10:09:15 2020 +0200
GROOVY-9593: Switch Spock from SNAPSHOT to 2.0-M3-groovy-3.0 (closes #1281)
With '-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true' running
with the unsupported Groovy 4 is possible.
https://github.com/spockframework/spock/pull/1164
---
build.gradle | 5 ++++-
subprojects/groovy-templates/build.gradle | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 2c99871..82034f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -147,7 +147,7 @@ ext {
slf4jVersion = '1.7.25'
xmlunitVersion = '1.6'
xstreamVersion = '1.4.12'
- spockVersion = '2.0-groovy-3.0-SNAPSHOT' // supports up to 9.9.99
+ spockVersion = '2.0-M3-groovy-3.0' // running with Groovy 4 can be allowed with '-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true'
spotbugsVersion = '4.0.3'
spotbugsAnnotationsVersion = '4.0.3'
checkstyleVersion = '8.32'
@@ -343,6 +343,9 @@ allprojects {
classpath = (classpath != null) ? classpath + groovyClasspath : groovyClasspath
}.configureEach {
options.incremental = true
+ if (groovyVersion.startsWith('4')) {
+ options.forkOptions.jvmArgs += ["-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true"]
+ }
}
}
diff --git a/subprojects/groovy-templates/build.gradle b/subprojects/groovy-templates/build.gradle
index bcb9d23..e318372 100644
--- a/subprojects/groovy-templates/build.gradle
+++ b/subprojects/groovy-templates/build.gradle
@@ -37,6 +37,9 @@ dependencies {
test {
useJUnitPlatform()
+ if (groovyVersion.startsWith('4')) {
+ systemProperty "spock.iKnowWhatImDoing.disableGroovyVersionCheck", "true"
+ }
}
task backportJar(type:Jar) {
@@ -44,4 +47,4 @@ task backportJar(type:Jar) {
dependsOn classes
from sourceSets.main.output
include 'groovy/text/markup/**'
-}
\ No newline at end of file
+}