Enable javadoc for all modules by default
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/aae65db6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/aae65db6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/aae65db6 Branch: refs/heads/apex-runner Commit: aae65db663c27de5b9a21adedc2110cc21cd4061 Parents: 14e093a Author: Dan Halperin <dhalp...@google.com> Authored: Fri Nov 4 15:28:43 2016 -0700 Committer: Dan Halperin <dhalp...@google.com> Committed: Fri Nov 4 18:29:21 2016 -0700 ---------------------------------------------------------------------- examples/java/pom.xml | 68 ------------------------ examples/java8/pom.xml | 8 --- pom.xml | 11 +++- runners/core-java/pom.xml | 23 -------- runners/direct-java/pom.xml | 61 --------------------- runners/flink/examples/pom.xml | 8 --- runners/flink/runner/pom.xml | 8 --- runners/google-cloud-dataflow-java/pom.xml | 70 ------------------------- runners/spark/pom.xml | 4 -- sdks/java/core/pom.xml | 70 ------------------------- sdks/java/io/jdbc/pom.xml | 4 -- sdks/java/io/kafka/pom.xml | 7 --- sdks/java/io/kinesis/pom.xml | 7 --- sdks/java/io/mongodb/pom.xml | 4 -- 14 files changed, 10 insertions(+), 343 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/examples/java/pom.xml ---------------------------------------------------------------------- diff --git a/examples/java/pom.xml b/examples/java/pom.xml index 12a114f..857373a 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -285,74 +285,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <windowtitle>Apache Beam Examples</windowtitle> - <doctitle>Apache Beam Examples</doctitle> - - <subpackages>org.apache.beam.examples</subpackages> - <additionalparam>-exclude org.apache.beam.sdk.runners.worker:org.apache.beam.sdk.runners.dataflow:org.apache.beam.sdk.util ${beam.javadoc_opts}</additionalparam> - <use>false</use> - <quiet>true</quiet> - <bottom><![CDATA[<br>]]></bottom> - - <offlineLinks> - <!-- The Dataflow SDK docs --> - <offlineLink> - <url>https://cloud.google.com/dataflow/java-sdk/JavaDoc/</url> - <location>${basedir}/../../sdks/java/javadoc/dataflow-sdk-docs</location> - </offlineLink> - <!-- Other dependencies --> - <offlineLink> - <url>https://developers.google.com/api-client-library/java/google-api-java-client/reference/1.20.0/</url> - <location>${basedir}/../../sdks/java/javadoc/apiclient-docs</location> - </offlineLink> - <offlineLink> - <url>http://avro.apache.org/docs/${avro.version}/api/java/</url> - <location>${basedir}/../../sdks/java/javadoc/avro-docs</location> - </offlineLink> - <offlineLink> - <url>https://developers.google.com/resources/api-libraries/documentation/bigquery/v2/java/latest/</url> - <location>${basedir}/../../sdks/java/javadoc/bq-docs</location> - </offlineLink> - <offlineLink> - <url>https://cloud.google.com/datastore/docs/apis/javadoc/</url> - <location>${basedir}/../../sdks/java/javadoc/datastore-docs</location> - </offlineLink> - <offlineLink> - <url>http://docs.guava-libraries.googlecode.com/git-history/release18/javadoc/</url> - <location>${basedir}/../../sdks/java/javadoc/guava-docs</location> - </offlineLink> - <offlineLink> - <url>http://fasterxml.github.io/jackson-annotations/javadoc/2.7/</url> - <location>${basedir}/../../sdks/java/javadoc/jackson-annotations-docs</location> - </offlineLink> - <offlineLink> - <url>http://fasterxml.github.io/jackson-databind/javadoc/2.7/</url> - <location>${basedir}/../../sdks/java/javadoc/jackson-databind-docs</location> - </offlineLink> - <offlineLink> - <url>http://www.joda.org/joda-time/apidocs</url> - <location>${basedir}/../../sdks/java/javadoc/joda-docs</location> - </offlineLink> - <offlineLink> - <url>https://developers.google.com/api-client-library/java/google-oauth-java-client/reference/1.20.0/</url> - <location>${basedir}/../../sdks/java/javadoc/oauth-docs</location> - </offlineLink> - </offlineLinks> - </configuration> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/examples/java8/pom.xml ---------------------------------------------------------------------- diff --git a/examples/java8/pom.xml b/examples/java8/pom.xml index 18257d9..0a5dcb0 100644 --- a/examples/java8/pom.xml +++ b/examples/java8/pom.xml @@ -120,14 +120,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:missing</additionalparam> - </configuration> - </plugin> - - <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> <source>1.8</source> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 14c38fd..77e87ba 100644 --- a/pom.xml +++ b/pom.xml @@ -160,6 +160,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <additionalparam>${beam.javadoc_opts}</additionalparam> + </configuration> <executions> <execution> <id>javadoc</id> @@ -212,6 +215,11 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> </plugins> </build> </profile> @@ -222,9 +230,10 @@ <jdk>[1.8,)</jdk> </activation> <properties> - <beam.javadoc_opts>-Xdoclint:-missing</beam.javadoc_opts> + <beam.javadoc_opts>-Xdoclint:all -Xdoclint:-missing</beam.javadoc_opts> </properties> </profile> + <profile> <id>java7-packageinfo</id> <activation> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/runners/core-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/core-java/pom.xml b/runners/core-java/pom.xml index fa64660..3d8a84b 100644 --- a/runners/core-java/pom.xml +++ b/runners/core-java/pom.xml @@ -65,29 +65,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <windowtitle>Beam Runners Core utilities ${project.version} API</windowtitle> - <doctitle>Beam Runners Core utilities for Java, version ${project.version}</doctitle> - <overview>../javadoc/overview.html</overview> - - <subpackages>org.apache.beam.runners.core</subpackages> - <use>false</use> - <quiet>true</quiet> - <bottom><![CDATA[<br>]]></bottom> - </configuration> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/runners/direct-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index b781c6e..64e9b5a 100644 --- a/runners/direct-java/pom.xml +++ b/runners/direct-java/pom.xml @@ -94,67 +94,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <windowtitle>Apache Beam Direct Runner ${project.version}</windowtitle> - <doctitle>Apache Beam Direct Runner, version ${project.version}</doctitle> - - <subpackages>org.apache.beam.runners.direct</subpackages> - <use>false</use> - <quiet>true</quiet> - <bottom><![CDATA[<br>]]></bottom> - - <offlineLinks> - <offlineLink> - <url>https://developers.google.com/api-client-library/java/google-api-java-client/reference/1.20.0/</url> - <location>${basedir}/../../sdks/java/javadoc/apiclient-docs</location> - </offlineLink> - <offlineLink> - <url>http://avro.apache.org/docs/${avro.version}/api/java/</url> - <location>${basedir}/../../sdks/java/javadoc/avro-docs</location> - </offlineLink> - <offlineLink> - <url>https://developers.google.com/resources/api-libraries/documentation/bigquery/v2/java/latest/</url> - <location>${basedir}/../../sdks/java/javadoc/bq-docs</location> - </offlineLink> - <offlineLink> - <url>https://cloud.google.com/datastore/docs/apis/javadoc/</url> - <location>${basedir}/../../sdks/java/javadoc/datastore-docs</location> - </offlineLink> - <offlineLink> - <url>http://docs.guava-libraries.googlecode.com/git-history/release19/javadoc/</url> - <location>${basedir}/../../sdks/java/javadoc/guava-docs</location> - </offlineLink> - <offlineLink> - <url>http://hamcrest.org/JavaHamcrest/javadoc/1.3/</url> - <location>${basedir}/../../sdks/java/javadoc/hamcrest-docs</location> - </offlineLink> - <offlineLink> - <url>http://fasterxml.github.io/jackson-annotations/javadoc/2.7/</url> - <location>${basedir}/../../sdks/java/javadoc/jackson-annotations-docs</location> - </offlineLink> - <offlineLink> - <url>http://fasterxml.github.io/jackson-databind/javadoc/2.7/</url> - <location>${basedir}/../../sdks/java/javadoc/jackson-databind-docs</location> - </offlineLink> - <offlineLink> - <url>http://www.joda.org/joda-time/apidocs</url> - <location>${basedir}/../../sdks/java/javadoc/joda-docs</location> - </offlineLink> - <offlineLink> - <url>http://junit.sourceforge.net/javadoc/</url> - <location>${basedir}/../../sdks/java/javadoc/junit-docs</location> - </offlineLink> - <offlineLink> - <url>https://developers.google.com/api-client-library/java/google-oauth-java-client/reference/1.20.0/</url> - <location>${basedir}/../../sdks/java/javadoc/oauth-docs</location> - </offlineLink> - </offlineLinks> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/runners/flink/examples/pom.xml ---------------------------------------------------------------------- diff --git a/runners/flink/examples/pom.xml b/runners/flink/examples/pom.xml index 409d77b..051ec2d 100644 --- a/runners/flink/examples/pom.xml +++ b/runners/flink/examples/pom.xml @@ -110,14 +110,6 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:missing</additionalparam> - </configuration> - </plugin> - - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/runners/flink/runner/pom.xml ---------------------------------------------------------------------- diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml index 928889e..9729316 100644 --- a/runners/flink/runner/pom.xml +++ b/runners/flink/runner/pom.xml @@ -242,14 +242,6 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:missing</additionalparam> - </configuration> - </plugin> - <!-- Integration Tests --> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/runners/google-cloud-dataflow-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml index d8f1b82..0a2c9f6 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -85,76 +85,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <windowtitle>Google Cloud Dataflow Java Runner ${project.version}</windowtitle> - <doctitle>Google Cloud Dataflow Runner for Java, version ${project.version}</doctitle> - - <subpackages>org.apache.beam.runners.dataflow</subpackages> - <additionalparam>-exclude org.apache.beam.sdk.runners.dataflow.internal:org.apache.beam.sdk.runners.dataflow.testing:org.apache.beam.sdk.runners.dataflow.util ${beam.javadoc_opts}</additionalparam> - <use>false</use> - <quiet>true</quiet> - <bottom><![CDATA[<br>]]></bottom> - - <offlineLinks> - <offlineLink> - <url>https://developers.google.com/api-client-library/java/google-api-java-client/reference/1.20.0/</url> - <location>${basedir}/../../sdks/java/javadoc/apiclient-docs</location> - </offlineLink> - <offlineLink> - <url>http://avro.apache.org/docs/${avro.version}/api/java/</url> - <location>${basedir}/../../sdks/java/javadoc/avro-docs</location> - </offlineLink> - <offlineLink> - <url>https://developers.google.com/resources/api-libraries/documentation/bigquery/v2/java/latest/</url> - <location>${basedir}/../../sdks/java/javadoc/bq-docs</location> - </offlineLink> - <offlineLink> - <url>https://cloud.google.com/datastore/docs/apis/javadoc/</url> - <location>${basedir}/../../sdks/java/javadoc/datastore-docs</location> - </offlineLink> - <offlineLink> - <url>http://docs.guava-libraries.googlecode.com/git-history/release19/javadoc/</url> - <location>${basedir}/../../sdks/java/javadoc/guava-docs</location> - </offlineLink> - <offlineLink> - <url>http://hamcrest.org/JavaHamcrest/javadoc/1.3/</url> - <location>${basedir}/../../sdks/java/javadoc/hamcrest-docs</location> - </offlineLink> - <offlineLink> - <url>http://fasterxml.github.io/jackson-annotations/javadoc/2.7/</url> - <location>${basedir}/../../sdks/java/javadoc/jackson-annotations-docs</location> - </offlineLink> - <offlineLink> - <url>http://fasterxml.github.io/jackson-databind/javadoc/2.7/</url> - <location>${basedir}/../../sdks/java/javadoc/jackson-databind-docs</location> - </offlineLink> - <offlineLink> - <url>http://www.joda.org/joda-time/apidocs</url> - <location>${basedir}/../../sdks/java/javadoc/joda-docs</location> - </offlineLink> - <offlineLink> - <url>http://junit.sourceforge.net/javadoc/</url> - <location>${basedir}/../../sdks/java/javadoc/junit-docs</location> - </offlineLink> - <offlineLink> - <url>https://developers.google.com/api-client-library/java/google-oauth-java-client/reference/1.20.0/</url> - <location>${basedir}/../../sdks/java/javadoc/oauth-docs</location> - </offlineLink> - </offlineLinks> - </configuration> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/runners/spark/pom.xml ---------------------------------------------------------------------- diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml index 0edafe8..a3ca296 100644 --- a/runners/spark/pom.xml +++ b/runners/spark/pom.xml @@ -415,10 +415,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/sdks/java/core/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index 40a511c..7d4d9ab 100644 --- a/sdks/java/core/pom.xml +++ b/sdks/java/core/pom.xml @@ -44,71 +44,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <windowtitle>Apache Beam SDK ${project.version} API</windowtitle> - <doctitle>Apache Beam SDK for Java, version ${project.version}</doctitle> - <overview>../javadoc/overview.html</overview> - - <subpackages>org.apache.beam.sdk</subpackages> - <additionalparam>-exclude - org.apache.beam.sdk.runners.worker:org.apache.beam.sdk.runners.dataflow:org.apache.beam.sdk.util:org.apache.beam.sdk.runners.inprocess - ${beam.javadoc_opts}</additionalparam> - <use>false</use> - <quiet>true</quiet> - <bottom><![CDATA[<br>]]></bottom> - - <offlineLinks> - <offlineLink> - <url>https://developers.google.com/api-client-library/java/google-api-java-client/reference/1.20.0/</url> - <location>${basedir}/../javadoc/apiclient-docs</location> - </offlineLink> - <offlineLink> - <url>http://avro.apache.org/docs/${avro.version}/api/java/</url> - <location>${basedir}/../javadoc/avro-docs</location> - </offlineLink> - <offlineLink> - <url>https://developers.google.com/resources/api-libraries/documentation/bigquery/v2/java/latest/</url> - <location>${basedir}/../javadoc/bq-docs</location> - </offlineLink> - <offlineLink> - <url>https://cloud.google.com/datastore/docs/apis/javadoc/</url> - <location>${basedir}/../javadoc/datastore-docs</location> - </offlineLink> - <offlineLink> - <url>http://docs.guava-libraries.googlecode.com/git-history/release19/javadoc/</url> - <location>${basedir}/../javadoc/guava-docs</location> - </offlineLink> - <offlineLink> - <url>http://hamcrest.org/JavaHamcrest/javadoc/1.3/</url> - <location>${basedir}/../javadoc/hamcrest-docs</location> - </offlineLink> - <offlineLink> - <url>http://fasterxml.github.io/jackson-annotations/javadoc/2.7/</url> - <location>${basedir}/../javadoc/jackson-annotations-docs</location> - </offlineLink> - <offlineLink> - <url>http://fasterxml.github.io/jackson-databind/javadoc/2.7/</url> - <location>${basedir}/../javadoc/jackson-databind-docs</location> - </offlineLink> - <offlineLink> - <url>http://www.joda.org/joda-time/apidocs</url> - <location>${basedir}/../javadoc/joda-docs</location> - </offlineLink> - <offlineLink> - <url>http://junit.sourceforge.net/javadoc/</url> - <location>${basedir}/../javadoc/junit-docs</location> - </offlineLink> - <offlineLink> - <url>https://developers.google.com/api-client-library/java/google-oauth-java-client/reference/1.20.0/</url> - <location>${basedir}/../javadoc/oauth-docs</location> - </offlineLink> - </offlineLinks> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <configuration> <!-- Set testSourceDirectory in order to exclude generated-test-sources --> @@ -172,11 +107,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/sdks/java/io/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/jdbc/pom.xml b/sdks/java/io/jdbc/pom.xml index a65ed46..2eb24bd 100644 --- a/sdks/java/io/jdbc/pom.xml +++ b/sdks/java/io/jdbc/pom.xml @@ -48,10 +48,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/sdks/java/io/kafka/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/kafka/pom.xml b/sdks/java/io/kafka/pom.xml index 184c1c9..2004952 100644 --- a/sdks/java/io/kafka/pom.xml +++ b/sdks/java/io/kafka/pom.xml @@ -52,13 +52,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:missing</additionalparam> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/sdks/java/io/kinesis/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/kinesis/pom.xml b/sdks/java/io/kinesis/pom.xml index 76df329..439995d 100644 --- a/sdks/java/io/kinesis/pom.xml +++ b/sdks/java/io/kinesis/pom.xml @@ -52,13 +52,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:missing</additionalparam> - </configuration> - </plugin> <!-- Integration Tests --> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aae65db6/sdks/java/io/mongodb/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/mongodb/pom.xml b/sdks/java/io/mongodb/pom.xml index d674e63..d0ae6ac 100644 --- a/sdks/java/io/mongodb/pom.xml +++ b/sdks/java/io/mongodb/pom.xml @@ -48,10 +48,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> </plugins> </build>
