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 2019/04/17 02:19:33 UTC
[groovy] branch GROOVY_2_5_X updated: more consistent JDK version
checking in tests (fix for JDK11+)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
new 7cf9afd more consistent JDK version checking in tests (fix for JDK11+)
7cf9afd is described below
commit 7cf9afd6f28f41081e16fe570e6d18173040335f
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Apr 17 12:17:59 2019 +1000
more consistent JDK version checking in tests (fix for JDK11+)
---
src/test/groovy/execute/ExecuteTest.groovy | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/test/groovy/execute/ExecuteTest.groovy b/src/test/groovy/execute/ExecuteTest.groovy
index bc458ba..d654c1d 100644
--- a/src/test/groovy/execute/ExecuteTest.groovy
+++ b/src/test/groovy/execute/ExecuteTest.groovy
@@ -74,7 +74,8 @@ class ExecuteTest extends GroovyTestCase {
"groovy.ui.GroovyMain",
"-e",
"sleep(2000); println('Done'); System.exit(0)"]
- if (isAtLeastJdk('9.0')) {
+ // jaxb deprecated in 9, gone in 11
+ if (isAtLeastJdk('9.0') && !isAtLeastJdk('11.0')) {
javaArgs.add(3, '--add-modules')
javaArgs.add(4, 'java.xml.bind')
}
@@ -126,7 +127,8 @@ class ExecuteTest extends GroovyTestCase {
"groovy.ui.GroovyMain",
"-e",
"println(System.getenv('foo'))"]
- if (isAtLeastJdk('9.0')) {
+ // jaxb deprecated in 9, gone in 11
+ if (isAtLeastJdk('9.0') && !isAtLeastJdk('11.0')) {
javaArgs.add(3, '--add-modules')
javaArgs.add(4, 'java.xml.bind')
}