You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/05/24 11:30:37 UTC

[1/2] incubator-beam git commit: [BEAM-287] Introduce new org.apache.beam groupIds

Repository: incubator-beam
Updated Branches:
  refs/heads/master 68b8cbc81 -> e2307f263


[BEAM-287] Introduce new org.apache.beam groupIds


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/98aaf749
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/98aaf749
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/98aaf749

Branch: refs/heads/master
Commit: 98aaf74974aa0f8c6a90687d852835264823f1a2
Parents: 68b8cbc
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Fri May 20 07:58:46 2016 +0200
Committer: Davor Bonaci <da...@google.com>
Committed: Tue May 24 04:30:04 2016 -0700

----------------------------------------------------------------------
 examples/java/pom.xml                                     |  4 ++--
 examples/java8/pom.xml                                    |  4 ++--
 pom.xml                                                   |  8 ++++----
 runners/core-java/pom.xml                                 |  6 +++---
 runners/direct-java/pom.xml                               | 10 +++++-----
 runners/flink/examples/pom.xml                            | 10 +++++-----
 runners/flink/pom.xml                                     |  6 +++---
 runners/flink/runner/pom.xml                              | 10 +++++-----
 runners/google-cloud-dataflow-java/pom.xml                | 10 +++++-----
 runners/pom.xml                                           |  3 ++-
 runners/spark/pom.xml                                     |  6 +++---
 sdks/java/extensions/join-library/pom.xml                 |  4 ++--
 sdks/java/extensions/pom.xml                              |  3 ++-
 sdks/java/io/google-cloud-platform/pom.xml                |  6 +++---
 sdks/java/io/hdfs/pom.xml                                 |  4 ++--
 sdks/java/io/kafka/pom.xml                                |  4 ++--
 sdks/java/io/pom.xml                                      |  3 ++-
 .../src/main/resources/archetype-resources/pom.xml        |  4 ++--
 18 files changed, 54 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/examples/java/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index e50b94a..eb77c88 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -214,8 +214,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>google-cloud-dataflow-java-runner</artifactId>
+      <groupId>org.apache.beam.runners</groupId>
+      <artifactId>google-cloud-dataflow-java</artifactId>
       <version>${project.version}</version>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/examples/java8/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java8/pom.xml b/examples/java8/pom.xml
index d4c91a5..17a1b6d 100644
--- a/examples/java8/pom.xml
+++ b/examples/java8/pom.xml
@@ -124,8 +124,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>google-cloud-dataflow-java-runner</artifactId>
+      <groupId>org.apache.beam.runners</groupId>
+      <artifactId>google-cloud-dataflow-java</artifactId>
       <version>${project.version}</version>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c76fb81..edddc8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,14 +245,14 @@
       </dependency>
 
       <dependency>
-        <groupId>org.apache.beam</groupId>
-        <artifactId>runners-core</artifactId>
+        <groupId>org.apache.beam.runners</groupId>
+        <artifactId>core</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.beam</groupId>
-        <artifactId>google-cloud-dataflow-java-runner</artifactId>
+        <groupId>org.apache.beam.runners</groupId>
+        <artifactId>google-cloud-dataflow-java</artifactId>
         <version>${project.version}</version>
       </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/runners/core-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/core-java/pom.xml b/runners/core-java/pom.xml
index b6f6f29..827c095 100644
--- a/runners/core-java/pom.xml
+++ b/runners/core-java/pom.xml
@@ -22,13 +22,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.beam</groupId>
-    <artifactId>runners-parent</artifactId>
+    <groupId>org.apache.beam.runners</groupId>
+    <artifactId>parent</artifactId>
     <version>0.1.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>runners-core</artifactId>
+  <artifactId>core</artifactId>
   <name>Apache Beam :: Runners :: Core</name>
   <description>Beam Runners Core provides utilities to aid runner authors.</description>
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/runners/direct-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml
index fb7ba47..0ce99ee 100644
--- a/runners/direct-java/pom.xml
+++ b/runners/direct-java/pom.xml
@@ -22,13 +22,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.beam</groupId>
-    <artifactId>runners-parent</artifactId>
+    <groupId>org.apache.beam.runners</groupId>
+    <artifactId>parent</artifactId>
     <version>0.1.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>direct-runner</artifactId>
+  <artifactId>direct</artifactId>
 
   <name>Apache Beam :: Runners :: Direct</name>
 
@@ -253,8 +253,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>runners-core</artifactId>
+      <groupId>org.apache.beam.runners</groupId>
+      <artifactId>core</artifactId>
     </dependency>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/runners/flink/examples/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/examples/pom.xml b/runners/flink/examples/pom.xml
index 6a624b2..44ef1da 100644
--- a/runners/flink/examples/pom.xml
+++ b/runners/flink/examples/pom.xml
@@ -22,13 +22,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.beam</groupId>
-    <artifactId>flink-runner-parent</artifactId>
+    <groupId>org.apache.beam.runners</groupId>
+    <artifactId>flink-parent</artifactId>
     <version>0.1.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>flink-runner-examples_2.10</artifactId>
+  <artifactId>flink_2.10-examples</artifactId>
 
   <name>Apache Beam :: Runners :: Flink :: Examples</name>
 
@@ -70,8 +70,8 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>flink-runner_2.10</artifactId>
+      <groupId>org.apache.beam.runners</groupId>
+      <artifactId>flink_2.10</artifactId>
       <version>${project.version}</version>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/runners/flink/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index 5e05e6a..5b958d0 100644
--- a/runners/flink/pom.xml
+++ b/runners/flink/pom.xml
@@ -22,13 +22,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.beam</groupId>
-    <artifactId>runners-parent</artifactId>
+    <groupId>org.apache.beam.runners</groupId>
+    <artifactId>parent</artifactId>
     <version>0.1.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>flink-runner-parent</artifactId>
+  <artifactId>flink-parent</artifactId>
   <version>0.1.0-incubating-SNAPSHOT</version>
 
   <name>Apache Beam :: Runners :: Flink</name>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/runners/flink/runner/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml
index 9020976..8d29320 100644
--- a/runners/flink/runner/pom.xml
+++ b/runners/flink/runner/pom.xml
@@ -22,13 +22,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.beam</groupId>
-    <artifactId>flink-runner-parent</artifactId>
+    <groupId>org.apache.beam.runners</groupId>
+    <artifactId>flink-parent</artifactId>
     <version>0.1.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>flink-runner_2.10</artifactId>
+  <artifactId>flink_2.10</artifactId>
 
   <name>Apache Beam :: Runners :: Flink :: Core</name>
 
@@ -76,8 +76,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>runners-core</artifactId>
+      <groupId>org.apache.beam.runners</groupId>
+      <artifactId>core</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/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 2b7b49d..973a8e2 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -22,13 +22,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.beam</groupId>
-    <artifactId>runners-parent</artifactId>
+    <groupId>org.apache.beam.runners</groupId>
+    <artifactId>parent</artifactId>
     <version>0.1.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>google-cloud-dataflow-java-runner</artifactId>
+  <artifactId>google-cloud-dataflow-java</artifactId>
 
   <name>Apache Beam :: Runners :: Google Cloud Dataflow</name>
 
@@ -288,8 +288,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>runners-core</artifactId>
+      <groupId>org.apache.beam.runners</groupId>
+      <artifactId>core</artifactId>
     </dependency>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/runners/pom.xml
----------------------------------------------------------------------
diff --git a/runners/pom.xml b/runners/pom.xml
index d2d68df..74af30c 100644
--- a/runners/pom.xml
+++ b/runners/pom.xml
@@ -28,7 +28,8 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>runners-parent</artifactId>
+  <groupId>org.apache.beam.runners</groupId>
+  <artifactId>parent</artifactId>
 
   <packaging>pom</packaging>
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/runners/spark/pom.xml
----------------------------------------------------------------------
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index 5daf1e1..68a000c 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -22,13 +22,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.beam</groupId>
-    <artifactId>runners-parent</artifactId>
+    <groupId>org.apache.beam.runners</groupId>
+    <artifactId>parent</artifactId>
     <version>0.1.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>spark-runner</artifactId>
+  <artifactId>spark</artifactId>
 
   <name>Apache Beam :: Runners :: Spark</name>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/sdks/java/extensions/join-library/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/join-library/pom.xml b/sdks/java/extensions/join-library/pom.xml
index 64b3bfc..041b6c8 100644
--- a/sdks/java/extensions/join-library/pom.xml
+++ b/sdks/java/extensions/join-library/pom.xml
@@ -22,8 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.beam</groupId>
-    <artifactId>extensions-parent</artifactId>
+    <groupId>org.apache.beam.extensions</groupId>
+    <artifactId>parent</artifactId>
     <version>0.1.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/sdks/java/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/pom.xml b/sdks/java/extensions/pom.xml
index 180b8b7..986b97e 100644
--- a/sdks/java/extensions/pom.xml
+++ b/sdks/java/extensions/pom.xml
@@ -28,7 +28,8 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>extensions-parent</artifactId>
+  <groupId>org.apache.beam.extensions</groupId>
+  <artifactId>parent</artifactId>
   <packaging>pom</packaging>
 
   <name>Apache Beam :: SDKs :: Java :: Extensions</name>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/sdks/java/io/google-cloud-platform/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml
index 18e4683..7f841c2 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -22,8 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.beam</groupId>
-    <artifactId>io-parent</artifactId>
+    <groupId>org.apache.beam.io</groupId>
+    <artifactId>parent</artifactId>
     <version>0.1.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
@@ -108,4 +108,4 @@
     </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/sdks/java/io/hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/hdfs/pom.xml b/sdks/java/io/hdfs/pom.xml
index e2d7eb2..fef589a 100644
--- a/sdks/java/io/hdfs/pom.xml
+++ b/sdks/java/io/hdfs/pom.xml
@@ -22,8 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.beam</groupId>
-    <artifactId>io-parent</artifactId>
+    <groupId>org.apache.beam.io</groupId>
+    <artifactId>parent</artifactId>
     <version>0.1.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/sdks/java/io/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/kafka/pom.xml b/sdks/java/io/kafka/pom.xml
index fdc4d6d..9fdb1a7 100644
--- a/sdks/java/io/kafka/pom.xml
+++ b/sdks/java/io/kafka/pom.xml
@@ -21,8 +21,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.beam</groupId>
-    <artifactId>io-parent</artifactId>
+    <groupId>org.apache.beam.io</groupId>
+    <artifactId>parent</artifactId>
     <version>0.1.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/sdks/java/io/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/pom.xml b/sdks/java/io/pom.xml
index 0027e0e..473b761 100644
--- a/sdks/java/io/pom.xml
+++ b/sdks/java/io/pom.xml
@@ -28,7 +28,8 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>io-parent</artifactId>
+  <groupId>org.apache.beam.io</groupId>
+  <artifactId>parent</artifactId>
   <packaging>pom</packaging>
   <name>Apache Beam :: SDKs :: Java :: IO</name>
   <description>Beam SDK Java IO provides different connectivity components

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/98aaf749/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
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 0a9dba5..420502b 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
@@ -100,8 +100,8 @@
 
     <!-- Adds a dependency on a specific version of the Dataflow runnner. -->
     <dependency>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>google-cloud-dataflow-java-runner</artifactId>
+      <groupId>org.apache.beam.runners</groupId>
+      <artifactId>google-cloud-dataflow-java</artifactId>
       <version>[0-incubating, 2-incubating)</version>
     </dependency>
 


[2/2] incubator-beam git commit: This closes #365

Posted by da...@apache.org.
This closes #365


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/e2307f26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/e2307f26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/e2307f26

Branch: refs/heads/master
Commit: e2307f263dc2936d1b62c696892831e66cb36162
Parents: 68b8cbc 98aaf74
Author: Davor Bonaci <da...@google.com>
Authored: Tue May 24 04:30:22 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Tue May 24 04:30:22 2016 -0700

----------------------------------------------------------------------
 examples/java/pom.xml                                     |  4 ++--
 examples/java8/pom.xml                                    |  4 ++--
 pom.xml                                                   |  8 ++++----
 runners/core-java/pom.xml                                 |  6 +++---
 runners/direct-java/pom.xml                               | 10 +++++-----
 runners/flink/examples/pom.xml                            | 10 +++++-----
 runners/flink/pom.xml                                     |  6 +++---
 runners/flink/runner/pom.xml                              | 10 +++++-----
 runners/google-cloud-dataflow-java/pom.xml                | 10 +++++-----
 runners/pom.xml                                           |  3 ++-
 runners/spark/pom.xml                                     |  6 +++---
 sdks/java/extensions/join-library/pom.xml                 |  4 ++--
 sdks/java/extensions/pom.xml                              |  3 ++-
 sdks/java/io/google-cloud-platform/pom.xml                |  6 +++---
 sdks/java/io/hdfs/pom.xml                                 |  4 ++--
 sdks/java/io/kafka/pom.xml                                |  4 ++--
 sdks/java/io/pom.xml                                      |  3 ++-
 .../src/main/resources/archetype-resources/pom.xml        |  4 ++--
 18 files changed, 54 insertions(+), 51 deletions(-)
----------------------------------------------------------------------