From 1be753c1031c2fdfe0f45851dd63223cb9f0d1f0 Mon Sep 17 00:00:00 2001 From: Davor Bonaci Date: Thu, 2 Jun 2016 13:21:31 -0700 Subject: [PATCH 1/2] Remove reporting section from Spark's pom.xml file This is currently triggering Maven warnings, due to a missing version qualifier. However, we don't run 'site', so this isn't being used at this point. Hence, removing instead of adding the version qualifier. --- runners/spark/pom.xml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml index db77185ebc48..df402d7d21f3 100644 --- a/runners/spark/pom.xml +++ b/runners/spark/pom.xml @@ -227,28 +227,6 @@ - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - aggregate - - aggregate - test-aggregate - - - - - - - jacoco From 3c6c704407edc46a69ab0b32f3e982f49686ba2d Mon Sep 17 00:00:00 2001 From: Davor Bonaci Date: Thu, 2 Jun 2016 09:47:44 -0700 Subject: [PATCH 2/2] Reorganizing Maven coordinates This makes the Maven coordinates in line with our module structure. Specifically, Maven groups are applied to all parent poms. --- examples/java/pom.xml | 12 +++++------ examples/java8/pom.xml | 16 +++++++-------- examples/pom.xml | 5 +++-- pom.xml | 20 +++++++++---------- runners/core-java/pom.xml | 4 ++-- runners/direct-java/pom.xml | 10 +++++----- runners/flink/examples/pom.xml | 6 +++--- runners/flink/pom.xml | 4 ++-- runners/flink/runner/pom.xml | 20 +++++++++---------- runners/google-cloud-dataflow-java/pom.xml | 8 ++++---- runners/spark/pom.xml | 8 ++++---- sdks/java/build-tools/pom.xml | 6 +++--- sdks/java/core/pom.xml | 6 +++--- sdks/java/extensions/join-library/pom.xml | 6 +++--- sdks/java/extensions/pom.xml | 6 +++--- sdks/java/io/google-cloud-platform/pom.xml | 10 +++++----- sdks/java/io/hdfs/pom.xml | 6 +++--- sdks/java/io/kafka/pom.xml | 6 +++--- sdks/java/io/pom.xml | 6 +++--- sdks/java/java8tests/pom.xml | 10 +++++----- sdks/java/maven-archetypes/examples/pom.xml | 6 +++--- .../resources/archetype-resources/pom.xml | 4 ++-- sdks/java/maven-archetypes/pom.xml | 7 ++++--- sdks/java/maven-archetypes/starter/pom.xml | 7 +++---- .../resources/archetype-resources/pom.xml | 4 ++-- .../projects/basic/reference/pom.xml | 4 ++-- sdks/java/pom.xml | 7 ++++--- sdks/pom.xml | 5 +++-- testing/travis/test_wordcount.sh | 2 +- 29 files changed, 112 insertions(+), 109 deletions(-) diff --git a/examples/java/pom.xml b/examples/java/pom.xml index 85786a42672e..10965b3b8be7 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -20,14 +20,14 @@ 4.0.0 - org.apache.beam + org.apache.beam.examples parent 0.2.0-incubating-SNAPSHOT - ../../pom.xml + ../pom.xml - java-examples-all - Apache Beam :: Examples :: Java All + java + Apache Beam :: Examples :: Java Apache Beam SDK provides a simple, Java-based interface for processing virtually any size data. This artifact includes all Apache Beam Java SDK examples. @@ -207,8 +207,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core diff --git a/examples/java8/pom.xml b/examples/java8/pom.xml index 75e61d02788d..5398b4733b45 100644 --- a/examples/java8/pom.xml +++ b/examples/java8/pom.xml @@ -20,14 +20,14 @@ 4.0.0 - org.apache.beam + org.apache.beam.examples parent 0.2.0-incubating-SNAPSHOT - ../../pom.xml + ../pom.xml - java8examples-all - Apache Beam :: Examples :: Java 8 All + java8 + Apache Beam :: Examples :: Java 8 Apache Beam Java SDK provides a simple, Java-based interface for processing virtually any size data. This artifact includes examples of the SDK from a Java 8 @@ -106,13 +106,13 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core - org.apache.beam - java-examples-all + org.apache.beam.examples + java ${project.version} diff --git a/examples/pom.xml b/examples/pom.xml index 9159dc2d08e6..22ac9744594a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -26,7 +26,8 @@ ../pom.xml - examples-parent + org.apache.beam.examples + parent pom @@ -48,4 +49,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index d6024598af07..7a83d0290dba 100644 --- a/pom.xml +++ b/pom.xml @@ -258,8 +258,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core ${project.version} @@ -276,8 +276,8 @@ - org.apache.beam - java-examples-all + org.apache.beam.examples + java ${project.version} @@ -584,16 +584,16 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core ${project.version} test-jar test - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core ${project.version} tests test @@ -658,8 +658,8 @@ 6.17 - org.apache.beam - java-build-tools + org.apache.beam.sdks.java + build-tools ${project.version} diff --git a/runners/core-java/pom.xml b/runners/core-java/pom.xml index bcc202ac4421..f6fb208b4ff2 100644 --- a/runners/core-java/pom.xml +++ b/runners/core-java/pom.xml @@ -178,8 +178,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index 4c8903def7c3..f3deef5680a5 100644 --- a/runners/direct-java/pom.xml +++ b/runners/direct-java/pom.xml @@ -90,7 +90,7 @@ none true - org.apache.beam:java-sdk-all + org.apache.beam.sdks.java:core @@ -246,8 +246,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core @@ -331,8 +331,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core test-jar test diff --git a/runners/flink/examples/pom.xml b/runners/flink/examples/pom.xml index 11734a10d337..4d67c6553621 100644 --- a/runners/flink/examples/pom.xml +++ b/runners/flink/examples/pom.xml @@ -20,8 +20,8 @@ 4.0.0 - org.apache.beam.runners - flink-parent + org.apache.beam.runners.flink + parent 0.2.0-incubating-SNAPSHOT ../pom.xml @@ -68,7 +68,7 @@ - org.apache.beam.runners + org.apache.beam.runners.flink flink_2.10 ${project.version} diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml index a9f4e31ac088..2adf35dc9552 100644 --- a/runners/flink/pom.xml +++ b/runners/flink/pom.xml @@ -26,8 +26,8 @@ ../pom.xml - flink-parent - 0.2.0-incubating-SNAPSHOT + org.apache.beam.runners.flink + parent Apache Beam :: Runners :: Flink diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml index 47624d7beccf..28bc4c70f53e 100644 --- a/runners/flink/runner/pom.xml +++ b/runners/flink/runner/pom.xml @@ -20,8 +20,8 @@ 4.0.0 - org.apache.beam.runners - flink-parent + org.apache.beam.runners.flink + parent 0.2.0-incubating-SNAPSHOT ../pom.xml @@ -52,8 +52,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core org.slf4j @@ -93,8 +93,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core tests test @@ -106,8 +106,8 @@ - org.apache.beam - java-examples-all + org.apache.beam.examples + java org.slf4j @@ -179,7 +179,7 @@ none true - org.apache.beam:java-sdk-all + org.apache.beam.sdks.java:core @@ -203,7 +203,7 @@ none true - org.apache.beam:java-sdk-all + org.apache.beam.sdks.java:core diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml index 44f2d2218fef..aa97145ee89d 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -281,8 +281,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core @@ -431,8 +431,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core test-jar test diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml index df402d7d21f3..b72345a4ba13 100644 --- a/runners/spark/pom.xml +++ b/runners/spark/pom.xml @@ -72,8 +72,8 @@ true - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core @@ -83,8 +83,8 @@ - org.apache.beam - java-examples-all + org.apache.beam.examples + java diff --git a/sdks/java/build-tools/pom.xml b/sdks/java/build-tools/pom.xml index 4224760a402c..abe6068a71c7 100644 --- a/sdks/java/build-tools/pom.xml +++ b/sdks/java/build-tools/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - org.apache.beam - java-sdk-parent + org.apache.beam.sdks.java + parent 0.2.0-incubating-SNAPSHOT ../pom.xml - java-build-tools + build-tools Apache Beam :: SDKs :: Java :: Build Tools diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index f8ef69d5c16a..942c9ab20d01 100644 --- a/sdks/java/core/pom.xml +++ b/sdks/java/core/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - org.apache.beam - java-sdk-parent + org.apache.beam.sdks.java + parent 0.2.0-incubating-SNAPSHOT ../pom.xml - java-sdk-all + core Apache Beam :: SDKs :: Java :: Core Beam SDK Java All provides a simple, Java-based interface for processing virtually any size data. This diff --git a/sdks/java/extensions/join-library/pom.xml b/sdks/java/extensions/join-library/pom.xml index b44f8a6d3792..703a1ff20394 100644 --- a/sdks/java/extensions/join-library/pom.xml +++ b/sdks/java/extensions/join-library/pom.xml @@ -20,7 +20,7 @@ 4.0.0 - org.apache.beam.extensions + org.apache.beam.sdks.java.extensions parent 0.2.0-incubating-SNAPSHOT ../pom.xml @@ -52,8 +52,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core diff --git a/sdks/java/extensions/pom.xml b/sdks/java/extensions/pom.xml index ff8e9de5b1df..89455ca22775 100644 --- a/sdks/java/extensions/pom.xml +++ b/sdks/java/extensions/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - org.apache.beam - java-sdk-parent + org.apache.beam.sdks.java + parent 0.2.0-incubating-SNAPSHOT ../pom.xml - org.apache.beam.extensions + org.apache.beam.sdks.java.extensions parent pom diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml index c0c48ed2a65f..828f615b7034 100644 --- a/sdks/java/io/google-cloud-platform/pom.xml +++ b/sdks/java/io/google-cloud-platform/pom.xml @@ -20,7 +20,7 @@ 4.0.0 - org.apache.beam.io + org.apache.beam.sdks.java.io parent 0.2.0-incubating-SNAPSHOT ../pom.xml @@ -58,8 +58,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core @@ -81,8 +81,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core tests test diff --git a/sdks/java/io/hdfs/pom.xml b/sdks/java/io/hdfs/pom.xml index 5dbb0385b9f9..e0276d3ba7f6 100644 --- a/sdks/java/io/hdfs/pom.xml +++ b/sdks/java/io/hdfs/pom.xml @@ -20,7 +20,7 @@ 4.0.0 - org.apache.beam.io + org.apache.beam.sdks.java.io parent 0.2.0-incubating-SNAPSHOT ../pom.xml @@ -53,8 +53,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core diff --git a/sdks/java/io/kafka/pom.xml b/sdks/java/io/kafka/pom.xml index d12fa20b87f9..9438b953dfa3 100644 --- a/sdks/java/io/kafka/pom.xml +++ b/sdks/java/io/kafka/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.beam.io + org.apache.beam.sdks.java.io parent 0.2.0-incubating-SNAPSHOT ../pom.xml @@ -52,8 +52,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core diff --git a/sdks/java/io/pom.xml b/sdks/java/io/pom.xml index 2c8e1ff075d8..47032785e98b 100644 --- a/sdks/java/io/pom.xml +++ b/sdks/java/io/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - org.apache.beam - java-sdk-parent + org.apache.beam.sdks.java + parent 0.2.0-incubating-SNAPSHOT ../pom.xml - org.apache.beam.io + org.apache.beam.sdks.java.io parent pom Apache Beam :: SDKs :: Java :: IO diff --git a/sdks/java/java8tests/pom.xml b/sdks/java/java8tests/pom.xml index 3d7ca57332c0..b4334a7bcaed 100644 --- a/sdks/java/java8tests/pom.xml +++ b/sdks/java/java8tests/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - org.apache.beam - java-sdk-parent + org.apache.beam.sdks.java + parent 0.2.0-incubating-SNAPSHOT ../pom.xml - java8tests-all + java8tests Apache Beam :: SDKs :: Java :: Tests Apache Beam Java SDK provides a simple, Java-based interface for processing virtually any size data. @@ -90,8 +90,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core test diff --git a/sdks/java/maven-archetypes/examples/pom.xml b/sdks/java/maven-archetypes/examples/pom.xml index c7e5b3aa7923..ed066b62a206 100644 --- a/sdks/java/maven-archetypes/examples/pom.xml +++ b/sdks/java/maven-archetypes/examples/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - org.apache.beam - maven-archetypes-parent + org.apache.beam.sdks.java.archetypes + parent 0.2.0-incubating-SNAPSHOT ../pom.xml - maven-archetypes-examples + examples Apache Beam :: SDKs :: Java :: Maven Archetypes :: Examples A Maven Archetype to create a project containing all the example pipelines from the Apache Beam Java SDK. diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml index 420502b79c58..8c09383ad0f8 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml @@ -93,8 +93,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core [0-incubating, 2-incubating) diff --git a/sdks/java/maven-archetypes/pom.xml b/sdks/java/maven-archetypes/pom.xml index 0a15db96fb43..5dd4258547b4 100644 --- a/sdks/java/maven-archetypes/pom.xml +++ b/sdks/java/maven-archetypes/pom.xml @@ -20,13 +20,14 @@ 4.0.0 - org.apache.beam - java-sdk-parent + org.apache.beam.sdks.java + parent 0.2.0-incubating-SNAPSHOT ../pom.xml - maven-archetypes-parent + org.apache.beam.sdks.java.archetypes + parent pom Apache Beam :: SDKs :: Java :: Maven Archetypes diff --git a/sdks/java/maven-archetypes/starter/pom.xml b/sdks/java/maven-archetypes/starter/pom.xml index 68f36d3b5167..378cac4be8a8 100644 --- a/sdks/java/maven-archetypes/starter/pom.xml +++ b/sdks/java/maven-archetypes/starter/pom.xml @@ -20,14 +20,13 @@ 4.0.0 - org.apache.beam - maven-archetypes-parent + org.apache.beam.sdks.java.archetypes + parent 0.2.0-incubating-SNAPSHOT ../pom.xml - org.apache.beam - maven-archetypes-starter + starter Apache Beam :: SDKs :: Java :: Maven Archetypes :: Starter A Maven archetype to create a simple starter pipeline to get started using the Apache Beam Java SDK. diff --git a/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml index b3cf4b5f217f..95c4cce2c0de 100644 --- a/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml @@ -40,8 +40,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core [0-incubating, 1-incubating) diff --git a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml index c9217c9f0d1a..28a57f2918e0 100644 --- a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml +++ b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml @@ -40,8 +40,8 @@ - org.apache.beam - java-sdk-all + org.apache.beam.sdks.java + core [0-incubating, 1-incubating) diff --git a/sdks/java/pom.xml b/sdks/java/pom.xml index 8745217ef65f..7eaaae4d369f 100644 --- a/sdks/java/pom.xml +++ b/sdks/java/pom.xml @@ -20,13 +20,14 @@ 4.0.0 - org.apache.beam - sdks-parent + org.apache.beam.sdks + parent 0.2.0-incubating-SNAPSHOT ../pom.xml - java-sdk-parent + org.apache.beam.sdks.java + parent pom diff --git a/sdks/pom.xml b/sdks/pom.xml index dfb8ebfaf73f..c7ce06a2c594 100644 --- a/sdks/pom.xml +++ b/sdks/pom.xml @@ -26,7 +26,8 @@ ../pom.xml - sdks-parent + org.apache.beam.sdks + parent pom @@ -57,4 +58,4 @@ - \ No newline at end of file + diff --git a/testing/travis/test_wordcount.sh b/testing/travis/test_wordcount.sh index 3efd37c9ff00..ffb55463d898 100755 --- a/testing/travis/test_wordcount.sh +++ b/testing/travis/test_wordcount.sh @@ -35,7 +35,7 @@ set -o pipefail PASS=1 VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[') -JAR_FILE=examples/java/target/java-examples-all-bundled-${VERSION}.jar +JAR_FILE=examples/java/target/java-bundled-${VERSION}.jar function check_result_hash { local name=$1