[beam] branch master updated: Only generate Javadocs for latest Spark runner version (Spark 3) to fix the aggregateJavadoc task. (#17793)

[yi...@apache.org]

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

yichi 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 62d97cfc7b1 Only generate Javadocs for latest Spark runner version (Spark 3) to fix the aggregateJavadoc task. (#17793)
62d97cfc7b1 is described below

commit 62d97cfc7b11e9c6ddd2ef7bdde621c2e385374b
Author: Moritz Mack <mm...@talend.com>
AuthorDate: Wed Jun 1 20:14:06 2022 +0200

    Only generate Javadocs for latest Spark runner version (Spark 3) to fix the aggregateJavadoc task. (#17793)
---
 runners/spark/2/build.gradle      | 2 ++
 runners/spark/spark_runner.gradle | 1 +
 2 files changed, 3 insertions(+)

diff --git a/runners/spark/2/build.gradle b/runners/spark/2/build.gradle
index ef7eee04507..5b67ba126b2 100644
--- a/runners/spark/2/build.gradle
+++ b/runners/spark/2/build.gradle
@@ -25,6 +25,8 @@ project.ext {
   // Copy shared sources for Spark 2 to use Spark 3 as primary version in place
   copySourceBase = true
   archives_base_name = 'beam-runners-spark'
+  // Only export Javadocs for Spark 3
+  exportJavadoc = false
 }
 
 // Load the main build script which contains all build logic.
diff --git a/runners/spark/spark_runner.gradle b/runners/spark/spark_runner.gradle
index 785a2635b0f..81b10f280c3 100644
--- a/runners/spark/spark_runner.gradle
+++ b/runners/spark/spark_runner.gradle
@@ -24,6 +24,7 @@ applyJavaNature(
   enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.runners.spark',
   archivesBaseName: (project.hasProperty('archives_base_name') ? archives_base_name : archivesBaseName),
+  exportJavadoc: (project.hasProperty('exportJavadoc') ? exportJavadoc : true),
   classesTriggerCheckerBugs: [
     'SparkAssignWindowFn': 'https://github.com/typetools/checker-framework/issues/3793',
     'SparkCombineFn'     : 'https://github.com/typetools/checker-framework/issues/3793',