From 76425e7cbaf9396c59778e25d7bdcae6c5a20bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Mon, 21 Mar 2016 15:21:08 +0100 Subject: [PATCH] BEAM-78 - Rename, polish and update pom.xml --- examples/pom.xml | 60 +++++----- java8examples/pom.xml | 59 +++++----- java8tests/pom.xml | 55 ++++----- maven-archetypes/examples/pom.xml | 48 ++++---- .../resources/archetype-resources/pom.xml | 6 +- maven-archetypes/pom.xml | 41 +++++++ maven-archetypes/starter/pom.xml | 49 ++++---- .../resources/archetype-resources/pom.xml | 6 +- .../projects/basic/reference/pom.xml | 6 +- pom.xml | 109 ++++++++++++------ runners/flink/examples/pom.xml | 52 ++++----- runners/flink/pom.xml | 55 ++++----- runners/flink/runner/pom.xml | 57 ++++----- runners/pom.xml | 45 ++++---- runners/spark/pom.xml | 101 ++++------------ sdk/pom.xml | 51 ++++---- 16 files changed, 397 insertions(+), 403 deletions(-) create mode 100644 maven-archetypes/pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index ea44b01fe3a2..8b17dfe3f988 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -1,38 +1,38 @@ - + + 4.0.0 - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-parent - 1.6.0-SNAPSHOT + org.apache.beam + parent + 0.1.0-incubating-SNAPSHOT + ../pom.xml - com.google.cloud.dataflow - google-cloud-dataflow-java-examples-all - Google Cloud Dataflow Java Examples - All - Google Cloud Dataflow Java SDK provides a simple, Java-based - interface for processing virtually any size data using Google cloud - resources. This artifact includes all Dataflow Java SDK - examples. - http://cloud.google.com/dataflow + java-examples-all + Apache Beam :: Examples :: Java All + Apache Beam SDK provides a simple, Java-based + interface for processing virtually any size data. This + artifact includes all Apache Beam Java SDK examples. jar @@ -112,8 +112,8 @@ org.apache.maven.plugins maven-javadoc-plugin - Google Cloud Dataflow Examples - Google Cloud Dataflow Examples + Apache Beam Examples + Apache Beam Examples com.google.cloud.dataflow.examples -exclude com.google.cloud.dataflow.sdk.runners.worker:com.google.cloud.dataflow.sdk.runners.dataflow:com.google.cloud.dataflow.sdk.util ${dataflow.javadoc_opts} @@ -237,8 +237,8 @@ - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-all + org.apache.beam + java-sdk-all ${project.version} diff --git a/java8examples/pom.xml b/java8examples/pom.xml index 60d7e0f0125f..eb3ef01a4ead 100644 --- a/java8examples/pom.xml +++ b/java8examples/pom.xml @@ -1,38 +1,39 @@ - + + 4.0.0 - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-parent - 1.6.0-SNAPSHOT + org.apache.beam + parent + 0.1.0-incubating-SNAPSHOT + ../pom.xml - com.google.cloud.dataflow - google-cloud-dataflow-java-java8examples-all - Google Cloud Dataflow Java 8 Examples - All - Google Cloud Dataflow Java SDK provides a simple, Java-based - interface for processing virtually any size data using Google cloud - resources. This artifact includes examples of the SDK from a Java 8 + java8examples-all + Apache Beam :: Examples :: Java 8 All + 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 user. - http://cloud.google.com/dataflow jar @@ -151,14 +152,14 @@ - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-all + org.apache.beam + java-sdk-all ${project.version} - com.google.cloud.dataflow - google-cloud-dataflow-java-examples-all + org.apache.beam + java-examples-all ${project.version} diff --git a/java8tests/pom.xml b/java8tests/pom.xml index de44ed49b7b7..1d253dc9f8ce 100644 --- a/java8tests/pom.xml +++ b/java8tests/pom.xml @@ -1,38 +1,39 @@ - + + 4.0.0 - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-parent - 1.6.0-SNAPSHOT + org.apache.beam + parent + 0.1.0-incubating-SNAPSHOT + ../pom.xml - com.google.cloud.dataflow - google-cloud-dataflow-java-java8tests-all - Google Cloud Dataflow Java 8 Tests - All - Google Cloud Dataflow Java SDK provides a simple, Java-based - interface for processing virtually any size data using Google cloud - resources. This artifact includes tests of the SDK from a Java 8 + java8tests-all + Apache Beam :: Tests :: Java 8 All + Apache Beam Java SDK provides a simple, Java-based + interface for processing virtually any size data. + This artifact includes tests of the SDK from a Java 8 user. - http://cloud.google.com/dataflow jar @@ -149,8 +150,8 @@ - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-all + org.apache.beam + java-sdk-all ${project.version} diff --git a/maven-archetypes/examples/pom.xml b/maven-archetypes/examples/pom.xml index 4e999083b0b9..7e74b9de6c62 100644 --- a/maven-archetypes/examples/pom.xml +++ b/maven-archetypes/examples/pom.xml @@ -1,37 +1,37 @@ - + + 4.0.0 - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-parent - 1.6.0-SNAPSHOT - ../../pom.xml + org.apache.beam + maven-archetypes-parent + 0.1.0-incubating-SNAPSHOT + ../pom.xml - com.google.cloud.dataflow - google-cloud-dataflow-java-archetypes-examples - Google Cloud Dataflow Java SDK - Examples Archetype + maven-archetypes-examples + Apache Beam :: Maven Archetypes :: Examples A Maven Archetype to create a project containing all the - example pipelines from the Google Cloud Dataflow Java SDK. - http://cloud.google.com/dataflow + example pipelines from the Apache Beam Java SDK. maven-archetype diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml index bffa376f5666..a1ef7794386d 100644 --- a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml +++ b/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml @@ -92,9 +92,9 @@ - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-all - [1.0.0, 2.0.0) + org.apache.beam + java-sdk-all + [0, 2) diff --git a/maven-archetypes/pom.xml b/maven-archetypes/pom.xml new file mode 100644 index 000000000000..4565253d3b40 --- /dev/null +++ b/maven-archetypes/pom.xml @@ -0,0 +1,41 @@ + + + + + 4.0.0 + + + org.apache.beam + parent + 0.1.0-incubating-SNAPSHOT + ../pom.xml + + + maven-archetypes-parent + pom + + Apache Beam :: Maven Archetypes + + + starter + examples + + + \ No newline at end of file diff --git a/maven-archetypes/starter/pom.xml b/maven-archetypes/starter/pom.xml index 0aa71c49f928..933e8b1a16b7 100644 --- a/maven-archetypes/starter/pom.xml +++ b/maven-archetypes/starter/pom.xml @@ -1,37 +1,38 @@ - + + 4.0.0 - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-parent - 1.6.0-SNAPSHOT - ../../pom.xml + org.apache.beam + maven-archetypes-parent + 0.1.0-incubating-SNAPSHOT + ../pom.xml - com.google.cloud.dataflow - google-cloud-dataflow-java-archetypes-starter - Google Cloud Dataflow Java SDK - Starter Archetype + org.apache.beam + maven-archetypes-starter + Apache Beam :: Maven Archetypes :: Starter A Maven archetype to create a simple starter pipeline to - get started using the Google Cloud Dataflow Java SDK. - http://cloud.google.com/dataflow + get started using the Apache Beam Java SDK. maven-archetype diff --git a/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml index bb679a00b4dc..385ddc858ad7 100644 --- a/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml +++ b/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml @@ -23,9 +23,9 @@ - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-all - [1.0.0, 2.0.0) + org.apache.beam + java-sdk-all + [0, 2) diff --git a/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml b/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml index d8c563d07fe4..2b28b9db689f 100644 --- a/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml +++ b/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml @@ -23,9 +23,9 @@ - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-all - [1.0.0, 2.0.0) + org.apache.beam + java-sdk-all + [0, 2) diff --git a/pom.xml b/pom.xml index da4c24fd437f..b8944d63b260 100644 --- a/pom.xml +++ b/pom.xml @@ -1,41 +1,42 @@ - + + 4.0.0 - com.google - google - 5 + org.apache + apache + 17 - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-parent - Google Cloud Dataflow Java SDK - Parent - Google Cloud Dataflow Java SDK provides a simple, Java-based - interface for processing virtually any size data using Google cloud - resources. This artifact includes the parent POM for other Dataflow - artifacts. - http://cloud.google.com/dataflow - 2013 + org.apache.beam + parent + Apache Beam :: Parent + Apache Beam provides a simple, Java-based interface + for processing virtually any size data. This artifact includes the parent POM + for other Beam artifacts. + http://beam.incubator.apache.org + 2016 - 1.6.0-SNAPSHOT + 0.1.0-incubating-SNAPSHOT @@ -45,19 +46,51 @@ + + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-beam.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-beam.git + https://git-wip-us.apache.org/repos/asf?p=incubator-beam.git;a=summary + + + + jira + https://issues.apache.org/jira/browse/BEAM + + + + + Beam Dev + dev-subscribe@beam.incubator.apache.org + dev-unsubscribe@beam.incubator.apache.org + dev@beam.incubator.apache.org + http://www.mail-archive.com/dev%beam.incubator.apache.org + + + Beam User + user-subscribe@beam.incubator.apache.org + user-unsubscribe@beam.incubator.apache.org + user@beam.incubator.apache.org + http://www.mail-archive.com/user%beam.incubator.apache.org + + + Beam Commits + commits-subscribe@beam.incubator.apache.org + commits-unsubscribe@beam.incubator.apache.org + commits@beam.incubator.apache.org + http://www.mail-archive.com/commits%beam.incubator.apache.org + + + - Google Inc. - http://www.google.com + The Apache Beam Team + dev@beam.incubator.apache.org + http://beam.incubator.apache.org + Apache Software Foundation + http://www.apache.org - - scm:git:git@github.com:GoogleCloudPlatform/DataflowJavaSDK.git - scm:git:git@github.com:GoogleCloudPlatform/DataflowJavaSDK.git - git@github.com:GoogleCloudPlatform/DataflowJavaSDK.git - - 3.0.3 @@ -90,12 +123,12 @@ pom + sdk runners examples - maven-archetypes/starter - maven-archetypes/examples + maven-archetypes diff --git a/runners/flink/examples/pom.xml b/runners/flink/examples/pom.xml index 91cc1b7bbd97..1c0a4dd5aa7b 100644 --- a/runners/flink/examples/pom.xml +++ b/runners/flink/examples/pom.xml @@ -1,48 +1,38 @@ - + 4.0.0 org.apache.beam flink-runner-parent - 0.4-SNAPSHOT + 0.1.0-incubating-SNAPSHOT + ../pom.xml flink-runner-examples_2.10 - 0.4-SNAPSHOT - Flink Beam Runner Examples - jar - - 2015 + Apache Beam :: Runners :: Flink :: Examples - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - + jar diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml index 31713cd0d446..608dc7c0020a 100644 --- a/runners/flink/pom.xml +++ b/runners/flink/pom.xml @@ -1,59 +1,50 @@ - + 4.0.0 org.apache.beam runners-parent - 1.6.0-SNAPSHOT + 0.1.0-incubating-SNAPSHOT + ../pom.xml flink-runner-parent - 0.4-SNAPSHOT + 0.1.0-incubating-SNAPSHOT - Flink Beam Runner - pom + Apache Beam :: Runners :: Flink - 2015 + pom runner examples - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - UTF-8 UTF-8 1.0.0 - 1.6.0-SNAPSHOT + 0.1.0-incubating-SNAPSHOT diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml index ff4b368ab206..109eb256d533 100644 --- a/runners/flink/runner/pom.xml +++ b/runners/flink/runner/pom.xml @@ -1,48 +1,39 @@ - + 4.0.0 org.apache.beam flink-runner-parent - 0.4-SNAPSHOT + 0.1.0-incubating-SNAPSHOT + ../pom.xml flink-runner_2.10 - 0.4-SNAPSHOT - Flink Beam Runner Core - jar + Apache Beam :: Runners :: Flink :: Core - 2015 + jar - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - @@ -72,10 +63,10 @@ flink-avro_2.10 ${flink.version} - + - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-all + org.apache.beam + java-sdk-all ${beam.version} @@ -86,8 +77,8 @@ - com.google.cloud.dataflow - google-cloud-dataflow-java-examples-all + org.apache.beam + java-examples-all ${beam.version} diff --git a/runners/pom.xml b/runners/pom.xml index b2e9eb1f6727..fc379ce0fe16 100644 --- a/runners/pom.xml +++ b/runners/pom.xml @@ -1,40 +1,37 @@ - + 4.0.0 - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-parent - 1.6.0-SNAPSHOT + org.apache.beam + parent + 0.1.0-incubating-SNAPSHOT - org.apache.beam runners-parent - 1.6.0-SNAPSHOT pom - Beam Runners + Apache Beam :: Runners flink diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml index 9d653a046468..05a601af1766 100644 --- a/runners/spark/pom.xml +++ b/runners/spark/pom.xml @@ -1,63 +1,45 @@ - + 4.0.0 org.apache.beam runners-parent - 1.6.0-SNAPSHOT + 0.1.0-incubating-SNAPSHOT spark-runner - 0.4.3-SNAPSHOT - Spark Beam Runner + Apache Beam :: Runners :: Spark jar - 2014 - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - UTF-8 UTF-8 1.7 1.5.2 - 1.6.0-SNAPSHOT + 0.1.0-incubating-SNAPSHOT - - - apache.snapshots - Apache Development Snapshot Repository - https://repository.apache.org/content/repositories/snapshots/ - - false - - - true - - - - org.apache.spark @@ -89,8 +71,8 @@ License. ${guava.version} - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-all + org.apache.beam + java-sdk-all ${beam.version} @@ -101,8 +83,8 @@ License. - com.google.cloud.dataflow - google-cloud-dataflow-java-examples-all + org.apache.beam + java-examples-all ${beam.version} @@ -411,42 +393,7 @@ License. - - - - Cloudera, Inc. - - - - - scm:git:https://github.com/cloudera/spark-dataflow.git - scm:git:https://github.com/cloudera/spark-dataflow.git - scm:git:https://github.com/cloudera/spark-dataflow.git - HEAD - - - - 3.2.1 - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - - jacoco diff --git a/sdk/pom.xml b/sdk/pom.xml index 185abc2ae770..13fe9506f446 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -1,37 +1,38 @@ - + + 4.0.0 - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-parent - 1.6.0-SNAPSHOT + org.apache.beam + parent + 0.1.0-incubating-SNAPSHOT + ../pom.xml - com.google.cloud.dataflow - google-cloud-dataflow-java-sdk-all - Google Cloud Dataflow Java SDK - All - Google Cloud Dataflow Java SDK provides a simple, Java-based - interface for processing virtually any size data using Google cloud - resources. This artifact includes entire Dataflow Java SDK. - http://cloud.google.com/dataflow + java-sdk-all + Apache Beam :: SDK :: Java All + Beam SDK Java All provides a simple, Java-based + interface for processing virtually any size data. This + artifact includes entire Apache Beam Java SDK. jar