You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by bo...@apache.org on 2018/10/27 21:30:12 UTC

[2/2] tapestry-5 git commit: TAP5-2588: partial support for compiling Tapestry itself in Java 9 & 10

TAP5-2588: partial support for compiling Tapestry itself in Java 9 & 10

Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7cacb7c6
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7cacb7c6
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7cacb7c6

Branch: refs/heads/master
Commit: 7cacb7c6ab12c6d9cc51de858bcb637ad5cd8b5a
Parents: 352742d
Author: Bob Harner <bo...@gmail.com>
Authored: Sat Oct 27 17:28:48 2018 -0400
Committer: Bob Harner <bo...@gmail.com>
Committed: Sat Oct 27 17:28:48 2018 -0400

----------------------------------------------------------------------
 build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7cacb7c6/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index ea5382b..45872f6 100755
--- a/build.gradle
+++ b/build.gradle
@@ -117,6 +117,7 @@ dependencies {
 }
 
 def isJava9 = System.properties['java.version'].startsWith('9')
+def isJava10 = System.properties['java.version'].startsWith('10')
 
 subprojects {
 
@@ -192,8 +193,9 @@ subprojects {
         systemProperties["java.io.tmpdir"] = temporaryDir.absolutePath
 
         jvmArgs("-Dfile.encoding=UTF-8")
-        if (isJava9){
-          jvmArgs += ["--add-modules", "java.xml.ws.annotation"]
+        if (isJava9 || isJava10){
+          // TODO: make these regular dependencies instead
+          jvmArgs += ["--add-modules", "java.xml.ws.annotation,java.xml.bind"]
         }
 
         environment.LANG = 'en_US.UTF-8'