groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject groovy git commit: fix javadoc build config for JDK11
Date Sun, 19 Aug 2018 23:06:27 GMT
Repository: groovy
Updated Branches:
  refs/heads/master 1b83d1f5f -> 47cb62703


fix javadoc build config for JDK11


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/47cb6270
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/47cb6270
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/47cb6270

Branch: refs/heads/master
Commit: 47cb6270366ceda556bf7946fdc4cfcb7c86f6d3
Parents: 1b83d1f
Author: Paul King <paulk@asert.com.au>
Authored: Mon Aug 20 09:06:16 2018 +1000
Committer: Paul King <paulk@asert.com.au>
Committed: Mon Aug 20 09:06:16 2018 +1000

----------------------------------------------------------------------
 gradle/docs.gradle                   | 3 ++-
 subprojects/groovy-jaxb/build.gradle | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/47cb6270/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 3472e3c..76a9302 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -76,6 +76,8 @@ allprojects {
     groovydoc groovydocSpec
 }
 
+evaluationDependsOn('groovy-jaxb')
+
 // Root project has an extra 'all' javadoc task
 task javadocAll(type: Javadoc)
 javadocAll {
@@ -89,7 +91,6 @@ javadocAll {
 }
 javadocAll javadocSpec
 
-
 // Root project has an extra 'all' groovydoc task
 task groovydocAll(type: Groovydoc)
 groovydocAll {

http://git-wip-us.apache.org/repos/asf/groovy/blob/47cb6270/subprojects/groovy-jaxb/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jaxb/build.gradle b/subprojects/groovy-jaxb/build.gradle
index 659f439..a10ec2f 100644
--- a/subprojects/groovy-jaxb/build.gradle
+++ b/subprojects/groovy-jaxb/build.gradle
@@ -39,6 +39,9 @@ if (JavaVersion.current().isJava9Compatible()) {
     tasks.withType(JavaCompile) {
         classpath += configurations.jaxb
     }
+    tasks.withType(Javadoc) {
+        classpath += configurations.jaxb
+    }
     tasks.withType(GroovyCompile) {
         groovyClasspath += configurations.jaxb
         classpath += configurations.jaxb


Mime
View raw message