You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/11/04 17:56:45 UTC

[1/2] incubator-beam git commit: pom: move maven-archetypes to its proper spot in dep hierarchy

Repository: incubator-beam
Updated Branches:
  refs/heads/master f06deac8c -> 6e1e57b09


pom: move maven-archetypes to its proper spot in dep hierarchy


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

Branch: refs/heads/master
Commit: f19a25da225b65ecdf43342ec48389a8348e68ce
Parents: f06deac
Author: Dan Halperin <dh...@google.com>
Authored: Thu Nov 3 17:30:58 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Fri Nov 4 10:56:39 2016 -0700

----------------------------------------------------------------------
 pom.xml           | 4 ----
 sdks/java/pom.xml | 5 +----
 2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f19a25da/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 28845a5..14c38fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,10 +145,6 @@
     <module>sdks/java/build-tools</module>
     <module>sdks</module>
     <module>runners</module>
-    <!-- sdks/java/maven-archetypes has several dependencies on the DataflowPipelineRunner. 
-      Until these are refactored out or a released artifact exists, we need to modify the 
-      build order. -->
-    <module>sdks/java/maven-archetypes</module>
     <module>examples</module>
   </modules>
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f19a25da/sdks/java/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/pom.xml b/sdks/java/pom.xml
index 2866cb3..fb07d25 100644
--- a/sdks/java/pom.xml
+++ b/sdks/java/pom.xml
@@ -38,10 +38,7 @@
     <module>build-tools</module> -->
     <module>core</module>
     <module>io</module>
-    <!-- sdks/java/maven-archtypes has several dependencies on the
-         DataflowRunner. Until these are refactored out or
-         a released artifact exists, we need to modify the build order.
-    <module>maven-archetypes</module> -->
+    <module>maven-archetypes</module>
     <module>extensions</module>
     <module>microbenchmarks</module>
   </modules>


[2/2] incubator-beam git commit: Closes #1284

Posted by dh...@apache.org.
Closes #1284


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

Branch: refs/heads/master
Commit: 6e1e57b09f4fbab021eb0ebb0748accc8bd90d0a
Parents: f06deac f19a25d
Author: Dan Halperin <dh...@google.com>
Authored: Fri Nov 4 10:56:40 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Fri Nov 4 10:56:40 2016 -0700

----------------------------------------------------------------------
 pom.xml           | 4 ----
 sdks/java/pom.xml | 5 +----
 2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------