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/12/13 05:09:09 UTC

[1/2] incubator-beam git commit: [BEAM-1142] Upgrade maven-invoker to address maven bug ARCHETYPE-488.

Repository: incubator-beam
Updated Branches:
  refs/heads/master 91cc606b4 -> 5ef34f7ee


[BEAM-1142] Upgrade maven-invoker to address maven bug ARCHETYPE-488.


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

Branch: refs/heads/master
Commit: 2b84b7bc08e4e351074f5cbd9f20e908295bd7d8
Parents: 91cc606
Author: Pei He <pe...@google.com>
Authored: Mon Dec 12 17:41:59 2016 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Mon Dec 12 21:08:45 2016 -0800

----------------------------------------------------------------------
 sdks/java/maven-archetypes/examples-java8/pom.xml | 7 +++++++
 sdks/java/maven-archetypes/examples/pom.xml       | 7 +++++++
 sdks/java/maven-archetypes/starter/pom.xml        | 7 +++++++
 3 files changed, 21 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2b84b7bc/sdks/java/maven-archetypes/examples-java8/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples-java8/pom.xml b/sdks/java/maven-archetypes/examples-java8/pom.xml
index 5cf094e..4aeb627 100644
--- a/sdks/java/maven-archetypes/examples-java8/pom.xml
+++ b/sdks/java/maven-archetypes/examples-java8/pom.xml
@@ -50,6 +50,13 @@
         <plugin>
           <artifactId>maven-archetype-plugin</artifactId>
           <version>2.4</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.shared</groupId>
+              <artifactId>maven-invoker</artifactId>
+              <version>2.2</version>
+            </dependency>
+          </dependencies>
           <executions>
             <!-- archetype-packaging above binds this plugin's goals as follows:
                      archetype:jar to the package phase,

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2b84b7bc/sdks/java/maven-archetypes/examples/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples/pom.xml b/sdks/java/maven-archetypes/examples/pom.xml
index 637231f..72d85f9 100644
--- a/sdks/java/maven-archetypes/examples/pom.xml
+++ b/sdks/java/maven-archetypes/examples/pom.xml
@@ -50,6 +50,13 @@
         <plugin>
           <artifactId>maven-archetype-plugin</artifactId>
           <version>2.4</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.shared</groupId>
+              <artifactId>maven-invoker</artifactId>
+              <version>2.2</version>
+            </dependency>
+          </dependencies>
           <executions>
             <!-- archetype-packaging above binds this plugin's goals as follows:
                      archetype:jar to the package phase,

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2b84b7bc/sdks/java/maven-archetypes/starter/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/starter/pom.xml b/sdks/java/maven-archetypes/starter/pom.xml
index 0543470..8ee9438 100644
--- a/sdks/java/maven-archetypes/starter/pom.xml
+++ b/sdks/java/maven-archetypes/starter/pom.xml
@@ -47,6 +47,13 @@
         <plugin>
           <artifactId>maven-archetype-plugin</artifactId>
           <version>2.4</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.shared</groupId>
+              <artifactId>maven-invoker</artifactId>
+              <version>2.2</version>
+            </dependency>
+          </dependencies>
           <executions>
             <!-- archetype-packaging above binds this plugin's goals as follows:
                      archetype:jar to the package phase,


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

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


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

Branch: refs/heads/master
Commit: 5ef34f7ee8ecb89e4eae3b06fcd19e2102cd367b
Parents: 91cc606 2b84b7b
Author: Davor Bonaci <da...@google.com>
Authored: Mon Dec 12 21:08:56 2016 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Mon Dec 12 21:08:56 2016 -0800

----------------------------------------------------------------------
 sdks/java/maven-archetypes/examples-java8/pom.xml | 7 +++++++
 sdks/java/maven-archetypes/examples/pom.xml       | 7 +++++++
 sdks/java/maven-archetypes/starter/pom.xml        | 7 +++++++
 3 files changed, 21 insertions(+)
----------------------------------------------------------------------