From 119812a66bceb9e8b91dcd7afb26bc9b7ee5eee7 Mon Sep 17 00:00:00 2001 From: Kenneth Knowles Date: Tue, 3 May 2016 21:11:39 -0700 Subject: [PATCH] Speed up non-release builds --- pom.xml | 141 +++++++++++++++++----------- runners/direct-java/pom.xml | 8 -- sdks/java/core/pom.xml | 180 ++++++++++++++++++------------------ sdks/pom.xml | 21 +++++ 4 files changed, 197 insertions(+), 153 deletions(-) diff --git a/pom.xml b/pom.xml index b0b258bb8318..03534eec756f 100644 --- a/pom.xml +++ b/pom.xml @@ -132,19 +132,79 @@ sdks - + runners/google-cloud-dataflow-java runners - + sdks/java/maven-archetypes examples + + + + release + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + javadoc + package + + jar + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + package + + jar-no-fork + + + + attach-test-sources + package + + test-jar-no-fork + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + default-test-jar + + test-jar + + + + + + + + + doclint-java8-disable @@ -154,6 +214,7 @@ -Xdoclint:-missing + src @@ -329,8 +390,8 @@ google-api-services-storage ${storage.version} - + com.google.guava guava-jdk5 @@ -343,8 +404,8 @@ google-api-services-datastore-protobuf ${datastore.version} - + com.google.guava guava-jdk5 @@ -407,8 +468,8 @@ google-api-services-dataflow ${dataflow.version} - + com.google.guava guava-jdk5 @@ -421,8 +482,8 @@ google-api-services-clouddebugger ${clouddebugger.version} - + com.google.guava guava-jdk5 @@ -490,6 +551,7 @@ test-jar test + org.apache.beam java-sdk-all @@ -599,7 +661,7 @@ -Xlint:-try -Xlint:-unchecked -Xlint:-varargs - + @@ -620,12 +682,6 @@ jar - - default-test-jar - - test-jar - - @@ -633,37 +689,12 @@ org.apache.maven.plugins maven-source-plugin 2.4 - - - attach-sources - package - - jar-no-fork - - - - attach-test-sources - package - - test-jar-no-fork - - - org.apache.maven.plugins maven-javadoc-plugin 2.10.3 - - - javadoc - package - - jar - - - @@ -717,11 +748,11 @@ - - - **/AutoValue_*.class - - + + + **/AutoValue_*.class + + @@ -755,8 +786,8 @@ 2.19.1 - + org.eclipse.m2e lifecycle-mapping @@ -790,7 +821,7 @@ - + @@ -804,7 +835,7 @@ - + diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index 292cc56c8c5e..74477995c823 100644 --- a/runners/direct-java/pom.xml +++ b/runners/direct-java/pom.xml @@ -150,14 +150,6 @@ - - - - jar - - package - - diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index a3b7cad0f61d..d1adf55883db 100644 --- a/sdks/java/core/pom.xml +++ b/sdks/java/core/pom.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - @@ -49,6 +49,75 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + + Apache Beam SDK ${project.version} API + Apache Beam SDK for Java, version ${project.version} + ../javadoc/overview.html + + org.apache.beam.sdk + -exclude + org.apache.beam.sdk.runners.worker:org.apache.beam.sdk.runners.dataflow:org.apache.beam.sdk.util:org.apache.beam.sdk.runners.inprocess + ${dataflow.javadoc_opts} + false + true + ]]> + + + + https://developers.google.com/api-client-library/java/google-api-java-client/reference/1.20.0/ + ${basedir}/../javadoc/apiclient-docs + + + http://avro.apache.org/docs/1.7.7/api/java/ + ${basedir}/../javadoc/avro-docs + + + https://developers.google.com/resources/api-libraries/documentation/bigquery/v2/java/latest/ + ${basedir}/../javadoc/bq-docs + + + https://cloud.google.com/datastore/docs/apis/javadoc/ + ${basedir}/../javadoc/datastore-docs + + + http://docs.guava-libraries.googlecode.com/git-history/release19/javadoc/ + ${basedir}/../javadoc/guava-docs + + + http://hamcrest.org/JavaHamcrest/javadoc/1.3/ + ${basedir}/../javadoc/hamcrest-docs + + + http://fasterxml.github.io/jackson-annotations/javadoc/2.7/ + ${basedir}/../javadoc/jackson-annotations-docs + + + http://fasterxml.github.io/jackson-databind/javadoc/2.7/ + ${basedir}/../javadoc/jackson-databind-docs + + + http://www.joda.org/joda-time/apidocs + ${basedir}/../javadoc/joda-docs + + + http://junit.sourceforge.net/javadoc/ + ${basedir}/../javadoc/junit-docs + + + https://developers.google.com/api-client-library/java/google-oauth-java-client/reference/1.20.0/ + ${basedir}/../javadoc/oauth-docs + + + + + + + org.apache.maven.plugins @@ -60,7 +129,9 @@ maven-dependency-plugin - analyze-only + + analyze-only + true @@ -91,72 +162,6 @@ org.apache.maven.plugins maven-javadoc-plugin - - Apache Beam SDK ${project.version} API - Apache Beam SDK for Java, version ${project.version} - ../javadoc/overview.html - - org.apache.beam.sdk - -exclude org.apache.beam.sdk.runners.worker:org.apache.beam.sdk.runners.dataflow:org.apache.beam.sdk.util:org.apache.beam.sdk.runners.inprocess ${dataflow.javadoc_opts} - false - true - ]]> - - - - https://developers.google.com/api-client-library/java/google-api-java-client/reference/1.20.0/ - ${basedir}/../javadoc/apiclient-docs - - - http://avro.apache.org/docs/1.7.7/api/java/ - ${basedir}/../javadoc/avro-docs - - - https://developers.google.com/resources/api-libraries/documentation/bigquery/v2/java/latest/ - ${basedir}/../javadoc/bq-docs - - - https://cloud.google.com/datastore/docs/apis/javadoc/ - ${basedir}/../javadoc/datastore-docs - - - http://docs.guava-libraries.googlecode.com/git-history/release19/javadoc/ - ${basedir}/../javadoc/guava-docs - - - http://hamcrest.org/JavaHamcrest/javadoc/1.3/ - ${basedir}/../javadoc/hamcrest-docs - - - http://fasterxml.github.io/jackson-annotations/javadoc/2.7/ - ${basedir}/../javadoc/jackson-annotations-docs - - - http://fasterxml.github.io/jackson-databind/javadoc/2.7/ - ${basedir}/../javadoc/jackson-databind-docs - - - http://www.joda.org/joda-time/apidocs - ${basedir}/../javadoc/joda-docs - - - http://junit.sourceforge.net/javadoc/ - ${basedir}/../javadoc/junit-docs - - - https://developers.google.com/api-client-library/java/google-oauth-java-client/reference/1.20.0/ - ${basedir}/../javadoc/oauth-docs - - - - - - - jar - - package - - @@ -188,9 +193,8 @@ - + com.google.common org.apache.beam.sdk.repackaged.com.google.common @@ -203,8 +207,8 @@ - + bundle-rest-without-repackaging package @@ -259,10 +263,9 @@ - + org.codehaus.mojo build-helper-maven-plugin @@ -295,8 +298,8 @@ google-auth-library-oauth2-http 0.3.1 - + com.google.guava guava-jdk5 @@ -315,8 +318,8 @@ grpc-pubsub-v1 ${pubsubgrpc.version} - + com.google.guava guava-jdk5 @@ -349,8 +352,8 @@ google-http-client - + com.google.http-client google-http-client-jackson @@ -456,8 +459,8 @@ joda-time - + org.tukaani xz diff --git a/sdks/pom.xml b/sdks/pom.xml index 808f0d33c8c5..0567f5756eee 100644 --- a/sdks/pom.xml +++ b/sdks/pom.xml @@ -38,4 +38,25 @@ java + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + default-test-jar + + test-jar + + + + + + + + \ No newline at end of file