From 7f6d8472de98dbc7128942431dbfc3e2ebd1803f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Fri, 29 Apr 2016 15:26:01 +0200 Subject: [PATCH] [BEAM-154] Use dependencyManagement and pluginManagement to keep all modules sync in term of version --- examples/java/pom.xml | 96 ---- examples/java8/pom.xml | 84 +--- pom.xml | 449 +++++++++++++++++- runners/direct-java/pom.xml | 56 --- runners/flink/examples/pom.xml | 7 +- runners/flink/pom.xml | 64 +-- runners/flink/runner/pom.xml | 12 +- runners/google-cloud-dataflow-java/pom.xml | 123 ----- runners/spark/build-resources/checkstyle.xml | 225 --------- runners/spark/pom.xml | 163 +------ .../src/main/assembly}/src.xml | 0 sdks/java/core/pom.xml | 184 +------ sdks/java/extensions/join-library/pom.xml | 24 +- sdks/java/io/google-cloud-platform/pom.xml | 27 +- sdks/java/io/hdfs/pom.xml | 25 +- sdks/java/io/kafka/pom.xml | 34 +- sdks/java/java8tests/pom.xml | 38 -- 17 files changed, 554 insertions(+), 1057 deletions(-) delete mode 100644 runners/spark/build-resources/checkstyle.xml rename sdks/java/{ => build-tools/src/main/assembly}/src.xml (100%) diff --git a/examples/java/pom.xml b/examples/java/pom.xml index 342986f3f906..3457f71aa96f 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -60,23 +60,6 @@ org.apache.maven.plugins maven-source-plugin - 2.4 - - - attach-sources - compile - - jar - - - - attach-test-sources - test-compile - - test-jar - - - @@ -150,7 +133,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.1 package @@ -182,20 +164,6 @@ org.apache.maven.plugins maven-jar-plugin - - - default-jar - - jar - - - - default-test-jar - - test-jar - - - @@ -232,7 +200,6 @@ org.apache.beam java-sdk-all - ${project.version} @@ -244,121 +211,61 @@ com.google.api-client google-api-client - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - com.google.apis google-api-services-dataflow - ${dataflow.version} - - - - com.google.guava - guava-jdk5 - - com.google.apis google-api-services-bigquery - ${bigquery.version} - - - - com.google.guava - guava-jdk5 - - com.google.http-client google-http-client - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - org.apache.avro avro - ${avro.version} com.google.apis google-api-services-datastore-protobuf - ${datastore.version} - - - - com.google.guava - guava-jdk5 - - com.google.apis google-api-services-pubsub - ${pubsub.version} - - - - com.google.guava - guava-jdk5 - - com.google.guava guava - ${guava.version} com.google.code.findbugs jsr305 - ${jsr305.version} joda-time joda-time - ${joda.version} org.slf4j slf4j-api - ${slf4j.version} org.slf4j slf4j-jdk14 - ${slf4j.version} runtime @@ -374,19 +281,16 @@ org.hamcrest hamcrest-all - ${hamcrest.version} junit junit - ${junit.version} org.mockito mockito-all - 1.10.19 test diff --git a/examples/java8/pom.xml b/examples/java8/pom.xml index 95af76abc849..b4a9ec6d7fa4 100644 --- a/examples/java8/pom.xml +++ b/examples/java8/pom.xml @@ -71,42 +71,11 @@ org.apache.maven.plugins maven-source-plugin - 2.4 - - - attach-sources - compile - - jar - - - - attach-test-sources - test-compile - - test-jar - - - org.apache.maven.plugins maven-jar-plugin - - - default-jar - - jar - - - - default-test-jar - - test-jar - - - @@ -121,7 +90,6 @@ org.apache.beam java-sdk-all - ${project.version} @@ -139,114 +107,66 @@ com.google.guava guava - ${guava.version} org.slf4j slf4j-api - ${slf4j.version} org.apache.avro avro - ${avro.version} joda-time joda-time - ${joda.version} org.hamcrest hamcrest-all - ${hamcrest.version} test org.mockito mockito-all - 1.10.19 test junit junit - ${junit.version} test com.google.apis google-api-services-bigquery - ${bigquery.version} - - - - com.google.guava - guava-jdk5 - - com.google.http-client google-http-client - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - com.google.oauth-client google-oauth-client - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - com.google.apis google-api-services-pubsub - ${pubsub.version} - - - - com.google.guava - guava-jdk5 - - com.google.api-client google-api-client - ${google-clients.version} - - - com.google.guava - guava-jdk5 - - + + diff --git a/pom.xml b/pom.xml index 91c6da5ea4e1..9836338c29d1 100644 --- a/pom.xml +++ b/pom.xml @@ -107,13 +107,19 @@ v1b3-rev22-1.21.0 0.5.160222 v1beta2-rev1-4.0.0 + 1.0-rc2 + 1.1 1.21.0 + 1.4.3 + 0.5.160304 19.0 + 0.12.0 1.3 - 2.7.0 + 2.7.2 2.4 3.0.1 4.11 + 1.9.5 3.0.0-beta-1 v1-rev7-1.21.0 1.7.14 @@ -179,6 +185,364 @@ + + + + + org.apache.beam + java-sdk-all + ${project.version} + + + + org.apache.beam + google-cloud-dataflow-java-runner + ${project.version} + + + + org.apache.beam + java-examples-all + ${project.version} + + + + io.grpc + grpc-all + ${grpc.version} + + + + com.google.api-client + google-api-client + ${google-clients.version} + + + com.google.guava + guava-jdk5 + + + + + + com.google.oauth-client + google-oauth-client + ${google-clients.version} + + + com.google.guava + guava-jdk5 + + + + + + com.google.oauth-client + google-oauth-client-java6 + ${google-clients.version} + + + com.google.guava + guava-jdk5 + + + + + + com.google.http-client + google-http-client + ${google-clients.version} + + + com.google.guava + guava-jdk5 + + + + + + com.google.http-client + google-http-client-jackson + ${google-clients.version} + + + com.google.guava + guava-jdk5 + + + org.codehaus.jackson + jackson-core-asl + + + + + + com.google.http-client + google-http-client-jackson2 + ${google-clients.version} + + + com.google.guava + guava-jdk5 + + + + + + com.google.http-client + google-http-client-protobuf + ${google-clients.version} + + + com.google.guava + guava-jdk5 + + + + + + com.google.apis + google-api-services-bigquery + ${bigquery.version} + + + com.google.guava + guava-jdk5 + + + + + + com.google.apis + google-api-services-pubsub + ${pubsub.version} + + + com.google.guava + guava-jdk5 + + + + + + com.google.apis + google-api-services-storage + ${storage.version} + + + + com.google.guava + guava-jdk5 + + + + + + com.google.apis + google-api-services-datastore-protobuf + ${datastore.version} + + + + com.google.guava + guava-jdk5 + + + + com.google.http-client + google-http-client + + + com.google.api-client + google-api-client + + + com.google.oauth-client + google-oauth-client + + + com.google.http-client + google-http-client-jackson + + + com.google.http-client + google-http-client-protobuf + + + + + + com.google.auto.service + auto-service + ${google-auto-service.version} + + + + com.google.auto.value + auto-value + ${google-auto-value.version} + + + + com.google.code.findbugs + jsr305 + ${jsr305.version} + + + + com.google.cloud.bigdataoss + util + ${google-cloud-bigdataoss.version} + + + com.google.cloud.bigdataoss + gcsio + ${google-cloud-bigdataoss.version} + + + + com.google.apis + google-api-services-dataflow + ${dataflow.version} + + + + com.google.guava + guava-jdk5 + + + + + + com.google.apis + google-api-services-clouddebugger + ${clouddebugger.version} + + + + com.google.guava + guava-jdk5 + + + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-scala_2.10 + ${jackson.version} + + + + org.apache.avro + avro + ${avro.version} + + + + com.google.guava + guava + ${guava.version} + + + + joda-time + joda-time + ${joda.version} + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + + + + org.apache.beam + java-sdk-all + ${project.version} + test-jar + test + + + org.apache.beam + java-sdk-all + ${project.version} + tests + test + + + + org.hamcrest + hamcrest-all + ${hamcrest.version} + test + + + + junit + junit + ${junit.version} + test + + + + org.slf4j + slf4j-jdk14 + ${slf4j.version} + test + + + + com.google.guava + guava-testlib + ${guava.version} + test + + + + org.mockito + mockito-all + ${mockito.version} + test + + + + com.google.cloud.dataflow + google-cloud-dataflow-java-proto-library-all + ${google-cloud-dataflow-java-proto-library-all.version} + test + + + + + @@ -249,12 +613,57 @@ org.apache.maven.plugins maven-jar-plugin 2.5 + + + default-jar + + jar + + + + default-test-jar + + test-jar + + + + + + + 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 + + + @@ -419,6 +828,18 @@ 1.10 + + org.apache.maven.plugins + maven-shade-plugin + 2.4.1 + + + + org.apache.avro + avro-maven-plugin + ${avro.version} + + org.apache.maven.plugins maven-release-plugin @@ -432,6 +853,32 @@ + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.3.1 + + + enforce + + enforce + + + + + [1.7,) + + + [3.0.3,) + + + + + + + diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index 15a4e9cdd100..292cc56c8c5e 100644 --- a/runners/direct-java/pom.xml +++ b/runners/direct-java/pom.xml @@ -69,43 +69,12 @@ org.apache.maven.plugins maven-jar-plugin - - - default-jar - - jar - - - - default-test-jar - - test-jar - - - org.apache.maven.plugins maven-source-plugin - 2.4 - - - attach-sources - verify - - jar-no-fork - - - - attach-test-sources - verify - - test-jar-no-fork - - - @@ -194,7 +163,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.1 @@ -275,74 +243,55 @@ org.apache.beam java-sdk-all - ${project.version} com.google.http-client google-http-client-protobuf - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - runtime com.google.guava guava - - ${guava.version} com.google.guava guava-testlib - ${guava.version} test joda-time joda-time - ${joda.version} com.google.code.findbugs jsr305 - ${jsr305.version} com.fasterxml.jackson.core jackson-annotations - ${jackson.version} org.slf4j slf4j-api - ${slf4j.version} com.google.auto.service auto-service - 1.0-rc2 true com.google.auto.value auto-value - 1.1 provided @@ -350,35 +299,30 @@ org.hamcrest hamcrest-all - ${hamcrest.version} provided junit junit - ${junit.version} provided org.slf4j slf4j-jdk14 - ${slf4j.version} test org.mockito mockito-all - 1.10.19 test org.apache.beam java-sdk-all - ${project.version} test-jar test diff --git a/runners/flink/examples/pom.xml b/runners/flink/examples/pom.xml index d27f2db2f361..e5bab3e9c03e 100644 --- a/runners/flink/examples/pom.xml +++ b/runners/flink/examples/pom.xml @@ -79,11 +79,16 @@ + org.codehaus.mojo exec-maven-plugin - 1.2.1 java diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml index 608dc7c0020a..5e05e6a09f20 100644 --- a/runners/flink/pom.xml +++ b/runners/flink/pom.xml @@ -44,7 +44,6 @@ UTF-8 UTF-8 1.0.0 - 0.1.0-incubating-SNAPSHOT @@ -62,16 +61,27 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.maven.plugins + maven-source-plugin + + - - org.apache.maven.plugins maven-failsafe-plugin - 2.17 @@ -90,7 +100,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.17 -Dlog4j.configuration=log4j-test.properties -XX:-UseGCOverheadLimit @@ -99,60 +108,15 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 none - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.3.1 - - - enforce-maven - - enforce - - - - - [1.7,) - - - - [3.0.3,) - - - - - - - - - - diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml index 89c8d9949e66..ab8d266b28fb 100644 --- a/runners/flink/runner/pom.xml +++ b/runners/flink/runner/pom.xml @@ -91,7 +91,6 @@ org.apache.beam java-sdk-all - ${beam.version} org.slf4j @@ -103,7 +102,6 @@ org.apache.beam google-cloud-dataflow-java-runner - ${project.version} org.slf4j @@ -115,7 +113,6 @@ org.apache.beam java-examples-all - ${beam.version} org.slf4j @@ -140,14 +137,12 @@ org.mockito mockito-all - 1.9.5 test com.google.auto.service auto-service - 1.0-rc2 true @@ -155,6 +150,13 @@ + + org.apache.maven.plugins diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml index 55e7ed93145b..a1d48ce2e4d2 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -35,7 +35,6 @@ jar - 0.1.0-incubating-SNAPSHOT ${maven.build.timestamp} yyyy-MM-dd HH:mm @@ -108,43 +107,12 @@ org.apache.maven.plugins maven-jar-plugin - - - default-jar - - jar - - - - default-test-jar - - test-jar - - - org.apache.maven.plugins maven-source-plugin - 2.4 - - - attach-sources - compile - - jar - - - - attach-test-sources - test-compile - - test-jar - - - @@ -220,7 +188,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.1 @@ -318,194 +285,110 @@ org.apache.beam java-sdk-all - ${beam.version} com.google.api-client google-api-client - ${google-clients.version} - - - com.google.guava - guava-jdk5 - - com.google.oauth-client google-oauth-client - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - com.google.http-client google-http-client - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - com.google.http-client google-http-client-jackson2 - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - com.google.http-client google-http-client-protobuf - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - runtime com.google.apis google-api-services-dataflow - ${dataflow.version} - - - - com.google.guava - guava-jdk5 - - com.google.apis google-api-services-clouddebugger - ${clouddebugger.version} - - - - com.google.guava - guava-jdk5 - - com.google.apis google-api-services-bigquery - ${bigquery.version} - - - - com.google.guava - guava-jdk5 - - com.google.cloud.bigdataoss util - 1.4.3 com.google.guava guava - - ${guava.version} com.google.guava guava-testlib - ${guava.version} test joda-time joda-time - ${joda.version} com.google.protobuf protobuf-java - ${protobuf.version} com.google.code.findbugs jsr305 - ${jsr305.version} com.fasterxml.jackson.core jackson-core - ${jackson.version} com.fasterxml.jackson.core jackson-annotations - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} org.slf4j slf4j-api - ${slf4j.version} com.google.auto.service auto-service - 1.0-rc2 true com.google.auto.value auto-value - 1.1 provided @@ -513,35 +396,30 @@ org.hamcrest hamcrest-all - ${hamcrest.version} provided junit junit - ${junit.version} provided org.slf4j slf4j-jdk14 - ${slf4j.version} test org.mockito mockito-all - 1.10.19 test org.apache.beam java-sdk-all - ${beam.version} test-jar test @@ -549,7 +427,6 @@ com.google.cloud.dataflow google-cloud-dataflow-java-proto-library-all - 0.5.160304 test diff --git a/runners/spark/build-resources/checkstyle.xml b/runners/spark/build-resources/checkstyle.xml deleted file mode 100644 index 033d8ae476de..000000000000 --- a/runners/spark/build-resources/checkstyle.xml +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml index eb0122994630..e6732464734a 100644 --- a/runners/spark/pom.xml +++ b/runners/spark/pom.xml @@ -25,6 +25,7 @@ org.apache.beam runners-parent 0.1.0-incubating-SNAPSHOT + ../pom.xml spark-runner @@ -35,9 +36,7 @@ UTF-8 UTF-8 - 1.7 1.6.1 - 0.1.0-incubating-SNAPSHOT @@ -68,18 +67,15 @@ com.google.guava guava - ${guava.version} com.google.auto.service auto-service - 1.0-rc2 true org.apache.beam java-sdk-all - ${beam.version} @@ -91,7 +87,6 @@ org.apache.beam java-examples-all - ${beam.version} @@ -118,13 +113,11 @@ junit junit - 4.12 test org.hamcrest hamcrest-all - 1.3 test @@ -132,155 +125,16 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.5 - - ${java.version} - ${java.version} - - -Xlint:all,-serial - - - org.apache.maven.plugins maven-surefire-plugin + 2.19.1 1 false - - org.apache.maven.plugins - maven-checkstyle-plugin - - build-resources/checkstyle.xml - false - - - - org.apache.maven.plugins - maven-source-plugin - 2.4 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - ${java.version} - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.0.0 - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - true - - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - org.apache.maven.plugins - maven-site-plugin - 3.4 - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.9.2 - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - org.apache.rat - apache-rat-plugin - 0.11 - - - .travis.yml - **/*.conf - **/*.iml - **/*.md - **/*.txt - **/.project - **/.checkstyle - **/.classpath - **/.settings/ - **/gen/** - **/resources/** - **/target/** - **/dependency-reduced-pom.xml - false - - - - - verify - verify - - check - - - - org.codehaus.mojo exec-maven-plugin @@ -321,7 +175,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.3 package @@ -352,12 +205,18 @@ org.apache.maven.plugins - maven-checkstyle-plugin + maven-compiler-plugin - org.apache.rat - apache-rat-plugin + org.apache.maven.plugins + maven-jar-plugin + + org.apache.maven.plugins maven-source-plugin diff --git a/sdks/java/src.xml b/sdks/java/build-tools/src/main/assembly/src.xml similarity index 100% rename from sdks/java/src.xml rename to sdks/java/build-tools/src/main/assembly/src.xml diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index 03d224d71b60..a3b7cad0f61d 100644 --- a/sdks/java/core/pom.xml +++ b/sdks/java/core/pom.xml @@ -68,8 +68,6 @@ - org.apache.maven.plugins maven-checkstyle-plugin @@ -82,51 +80,20 @@ org.apache.maven.plugins maven-jar-plugin - - - default-jar - - jar - - - - default-test-jar - - test-jar - - - org.apache.maven.plugins maven-source-plugin - 2.4 - - - attach-sources - compile - - jar - - - - attach-test-sources - test-compile - - test-jar - - - org.apache.maven.plugins maven-javadoc-plugin - Google Cloud Dataflow SDK ${project.version} API - Google Cloud Dataflow SDK for Java, version ${project.version} + Apache Beam SDK ${project.version} API + Apache Beam SDK for Java, version ${project.version} ../javadoc/overview.html org.apache.beam.sdk @@ -195,7 +162,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.1 @@ -278,7 +244,6 @@ org.apache.avro avro-maven-plugin - ${avro.version} schemas @@ -301,7 +266,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.9.1 add-test-source @@ -324,7 +288,6 @@ io.grpc grpc-all - 0.12.0 @@ -364,69 +327,26 @@ com.google.api-client google-api-client - ${google-clients.version} - - - com.google.guava - guava-jdk5 - - com.google.apis google-api-services-bigquery - ${bigquery.version} - - - - com.google.guava - guava-jdk5 - - com.google.apis google-api-services-pubsub - ${pubsub.version} - - - - com.google.guava - guava-jdk5 - - com.google.apis google-api-services-storage - ${storage.version} - - - - com.google.guava - guava-jdk5 - - com.google.http-client google-http-client - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - - - com.google.guava - guava-jdk5 - - - - org.codehaus.jackson - jackson-core-asl - - runtime com.google.http-client google-http-client-jackson2 - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - com.google.http-client google-http-client-protobuf - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - runtime com.google.oauth-client google-oauth-client-java6 - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - com.google.oauth-client google-oauth-client - ${google-clients.version} - - - - com.google.guava - guava-jdk5 - - com.google.apis google-api-services-datastore-protobuf - ${datastore.version} - - - - com.google.guava - guava-jdk5 - - - - com.google.http-client - google-http-client - - - com.google.api-client - google-api-client - - - com.google.oauth-client - google-oauth-client - - - com.google.http-client - google-http-client-jackson - - - com.google.http-client - google-http-client-protobuf - - com.google.cloud.bigdataoss gcsio - 1.4.3 com.google.cloud.bigdataoss util - 1.4.3 com.google.guava guava - - ${guava.version} com.google.guava guava-testlib - ${guava.version} test com.google.protobuf protobuf-java - ${protobuf.version} com.google.code.findbugs jsr305 - ${jsr305.version} com.fasterxml.jackson.core jackson-core - ${jackson.version} com.fasterxml.jackson.core jackson-annotations - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} org.slf4j slf4j-api - ${slf4j.version} org.apache.avro avro - ${avro.version} @@ -626,7 +454,6 @@ joda-time joda-time - ${joda.version} org.hamcrest hamcrest-all - 1.3 test junit junit - 4.12 test diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml index d1d5cd674895..18e46834b243 100644 --- a/sdks/java/io/google-cloud-platform/pom.xml +++ b/sdks/java/io/google-cloud-platform/pom.xml @@ -37,17 +37,36 @@ 0.2.3 + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + org.apache.beam java-sdk-all - ${project.version} io.grpc grpc-all - 0.12.0 @@ -66,7 +85,6 @@ org.apache.beam java-sdk-all - ${project.version} tests test @@ -74,21 +92,18 @@ org.hamcrest hamcrest-all - 1.3 test junit junit - 4.11 test org.slf4j slf4j-jdk14 - 1.7.14 test diff --git a/sdks/java/io/hdfs/pom.xml b/sdks/java/io/hdfs/pom.xml index 3eaef628b556..e2d7eb2d1ec7 100644 --- a/sdks/java/io/hdfs/pom.xml +++ b/sdks/java/io/hdfs/pom.xml @@ -31,13 +31,32 @@ hdfs Apache Beam :: SDKs :: Java :: IO :: HDFS Library to read and write Hadoop/HDFS file formats from Beam. - jar + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + org.apache.beam java-sdk-all - ${project.version} @@ -51,14 +70,12 @@ org.hamcrest hamcrest-all - 1.3 test junit junit - 4.11 test diff --git a/sdks/java/io/kafka/pom.xml b/sdks/java/io/kafka/pom.xml index ddfceed8ddb1..bb9baaa1f178 100644 --- a/sdks/java/io/kafka/pom.xml +++ b/sdks/java/io/kafka/pom.xml @@ -30,27 +30,32 @@ kafka Apache Beam :: SDKs :: Java :: IO :: Kafka Library to read Kafka topics. - jar - - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.maven.plugins + maven-checkstyle-plugin + + org.apache.beam java-sdk-all - ${project.version} @@ -63,21 +68,18 @@ org.hamcrest hamcrest-all - ${hamcrest.version} test junit junit - ${junit.version} test org.slf4j slf4j-jdk14 - ${slf4j.version} test diff --git a/sdks/java/java8tests/pom.xml b/sdks/java/java8tests/pom.xml index 27c40f7670b0..1032ae9245bf 100644 --- a/sdks/java/java8tests/pom.xml +++ b/sdks/java/java8tests/pom.xml @@ -35,8 +35,6 @@ This artifact includes tests of the SDK from a Java 8 user. - jar - @@ -77,42 +75,11 @@ org.apache.maven.plugins maven-source-plugin - 2.4 - - - attach-sources - compile - - jar - - - - attach-test-sources - test-compile - - test-jar - - - org.apache.maven.plugins maven-jar-plugin - - - default-jar - - jar - - - - default-test-jar - - test-jar - - - @@ -127,35 +94,30 @@ org.apache.beam java-sdk-all - ${project.version} test com.google.guava guava - ${guava.version} test joda-time joda-time - ${joda.version} test org.hamcrest hamcrest-all - ${hamcrest.version} test junit junit - ${junit.version} test