You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by jw...@apache.org on 2016/10/01 20:08:16 UTC
groovy git commit: build fix: jdk9 switched to GNU-style for new CLI
opts
Repository: groovy
Updated Branches:
refs/heads/master db814d5d0 -> f93cb30a4
build fix: jdk9 switched to GNU-style for new CLI opts
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f93cb30a
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f93cb30a
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f93cb30a
Branch: refs/heads/master
Commit: f93cb30a45a7fbc5a44061837c83114c14bcb074
Parents: db814d5
Author: John Wagenleitner <jw...@apache.org>
Authored: Sat Oct 1 12:33:22 2016 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sat Oct 1 12:33:22 2016 -0700
----------------------------------------------------------------------
gradle/jdk9.gradle | 4 ++--
.../runtime/m12n/ExtensionModuleHelperForTests.groovy | 2 +-
subprojects/groovy-xml/build.gradle | 9 +--------
3 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/f93cb30a/gradle/jdk9.gradle
----------------------------------------------------------------------
diff --git a/gradle/jdk9.gradle b/gradle/jdk9.gradle
index feba5db..eb8dfd3 100644
--- a/gradle/jdk9.gradle
+++ b/gradle/jdk9.gradle
@@ -19,10 +19,10 @@
if (JavaVersion.current().java9Compatible) {
allprojects {
tasks.withType(GroovyCompile) {
- groovyOptions.forkOptions.jvmArgs.addAll(['-addmods', 'java.xml.bind'])
+ groovyOptions.forkOptions.jvmArgs.addAll(['--add-modules', 'java.xml.bind'])
}
test {
- jvmArgs '-addmods', 'java.xml.bind'
+ jvmArgs '--add-modules', 'java.xml.bind'
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/f93cb30a/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy b/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
index dc727cd..be1f23b 100644
--- a/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
+++ b/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
@@ -64,7 +64,7 @@ public class ExtensionModuleHelperForTests {
}
}
if (jdk9) {
- jvmarg(value: '-addmods')
+ jvmarg(value: '--add-modules')
jvmarg(value: 'java.xml.bind')
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/f93cb30a/subprojects/groovy-xml/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/build.gradle b/subprojects/groovy-xml/build.gradle
index 400d48f..c5c2848 100644
--- a/subprojects/groovy-xml/build.gradle
+++ b/subprojects/groovy-xml/build.gradle
@@ -26,11 +26,4 @@ dependencies {
task moduleDescriptor(type: org.codehaus.groovy.gradle.WriteExtensionDescriptorTask) {
extensionClasses = 'org.codehaus.groovy.runtime.XmlGroovyMethods,groovy.xml.jaxb.JaxbGroovyMethods'
}
-
-compileJava {
- dependsOn moduleDescriptor
- if (JavaVersion.current().java9Compatible) {
- options.fork = true
- options.compilerArgs = ['-release', '6']
- }
-}
+compileJava.dependsOn moduleDescriptor
\ No newline at end of file