[incubator-heron] branch master updated: get javadocs generation script passing (#3533)

[joshfischer]

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

joshfischer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/master by this push:
     new a7291ce  get javadocs generation script passing (#3533)
a7291ce is described below

commit a7291cef99aca9ee0b5c66b23247924838ff6941
Author: Oliver Bristow <evilumbrella+git...@gmail.com>
AuthorDate: Sun May 31 17:34:18 2020 +0100

    get javadocs generation script passing (#3533)
    
    * add ./contrib/**/*.jar files to classpath
     * exclude ./tools/**/*.java from input (e.g. cppcheck+checkstyle)
---
 website2/website/scripts/javadocs.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/website2/website/scripts/javadocs.sh 
b/website2/website/scripts/javadocs.sh
index 7cdf4af..0d0770d 100755
--- a/website2/website/scripts/javadocs.sh
+++ b/website2/website/scripts/javadocs.sh
@@ -42,7 +42,7 @@ fi
   `bazel query 'kind("java_test", "heron/...")'` \
   `bazel query 'kind("java_library", "integration_test/...")'`)
 
-HERON_SRC_FILES=`find $HERON_ROOT_DIR -path "*/org/apache/*" -name "*.java"`
+HERON_SRC_FILES=`find $HERON_ROOT_DIR -path "*/org/apache/*" -name "*.java" 
-not -path "$HERON_ROOT_DIR/tools/*"`
 BACKTYPE_SRC_FILES=`find $HERON_ROOT_DIR -path "*/backtype/storm/*" -name 
"*.java"`
 APACHE_SRC_FILES=`find $HERON_ROOT_DIR -path "*/org/apache/storm/*" -name 
"*.java"`
 GEN_FILES=`find $GEN_PROTO_DIR -name "*.java"`
@@ -55,8 +55,9 @@ GEN_JARS=`find $HERON_ROOT_DIR/bazel-bin/external/. -name 
"*\.jar" | tr '\n' ':'
 SCRIBE_JARS=`find $HERON_ROOT_DIR/bazel-bin/. -name 
"libthrift_scribe_java.jar" | tr '\n' ':'`
 PROTO_JARS=`find $HERON_ROOT_DIR/bazel-bin/heron/proto/. -name "*\.jar" | tr 
'\n' ':'`
 
CLOSURE_CLASSES="$HERON_ROOT_DIR/bazel-bin/storm-compatibility/src/java/_javac/storm-compatibility-java/libstorm-compatibility-java_classes/."
+CONTRIB_JARS=`find $HERON_ROOT_DIR/bazel-bin/contrib/. -name "*\.jar" | tr 
'\n' ':'`
 
-export CLASSPATH=$BIN_JARS:$GEN_JARS:$SCRIBE_JARS:$PROTO_JARS:$CLOSURE_CLASSES
+export 
CLASSPATH=$BIN_JARS:$GEN_JARS:$SCRIBE_JARS:$PROTO_JARS:$CLOSURE_CLASSES:$CONTRIB_JARS
 
 $JAVADOC $FLAGS \
   -encoding "UTF-8" \