[beam] branch master updated: [BEAM-4809] Build javadoc on :javaPreCommit and :javaPostCommit to check it builds ok

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 3c46fc8  [BEAM-4809] Build javadoc on :javaPreCommit and :javaPostCommit to check it builds ok
3c46fc8 is described below

commit 3c46fc87d300c88063a271aa15d63f8cebfd8925
Author: Alan Myrvold <am...@google.com>
AuthorDate: Tue Jul 17 16:08:38 2018 -0700

    [BEAM-4809] Build javadoc on :javaPreCommit and :javaPostCommit to check it builds ok
---
 build.gradle                                                          | 1 +
 .../src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy    | 3 +++
 sdks/java/javadoc/build.gradle                                        | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/build.gradle b/build.gradle
index dcfadbb..2eb93a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -184,6 +184,7 @@ task javaPreCommit() {
   dependsOn ":beam-sdks-java-core:buildDependents"
   dependsOn ":beam-examples-java:preCommit"
   dependsOn ":beam-sdks-java-extensions-sql-jdbc:preCommit"
+  dependsOn ":beam-sdks-java-javadoc:allJavadoc"
 }
 
 task javaPostCommit() {
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 6916ab1..c778df9 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -643,6 +643,9 @@ class BeamModulePlugin implements Plugin<Project> {
       }
       project.checkstyle { toolVersion = "8.7" }
 
+      // Ensure check runs javadoc
+      project.check.dependsOn project.javadoc
+
       // Apply the eclipse and apt-eclipse plugins.  This adds the "eclipse" task and
       // connects the apt-eclipse plugin to update the eclipse project files
       // with the instructions needed to run apt within eclipse to handle the AutoValue
diff --git a/sdks/java/javadoc/build.gradle b/sdks/java/javadoc/build.gradle
index 240aef4..4f73e23 100644
--- a/sdks/java/javadoc/build.gradle
+++ b/sdks/java/javadoc/build.gradle
@@ -78,6 +78,10 @@ for (String exportedJavadocProject : exportedJavadocProjects) {
   evaluationDependsOn(exportedJavadocProject)
 }
 
+task allJavadoc() {
+  dependsOn exportedJavadocProjects.collect { "$it:javadoc" }
+}
+
 task aggregateJavadoc(type: Javadoc) {
   source exportedJavadocProjects.collect { project(it).sourceSets.main.allJava }
   classpath = files(exportedJavadocProjects.collect { project(it).sourceSets.main.compileClasspath })