You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by jb...@apache.org on 2017/07/24 04:57:36 UTC

[1/2] beam git commit: [BEAM-2662] Fix Java quickstart for Spark to include Spark version

Repository: beam
Updated Branches:
  refs/heads/master 49d4cf4de -> 5f1d1365b


[BEAM-2662] Fix Java quickstart for Spark to include Spark version


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

Branch: refs/heads/master
Commit: a7c18495f91c9d7537271c9595b3ac4d24003ece
Parents: f398748
Author: Luke Cwik <lc...@google.com>
Authored: Sun Jul 23 14:00:17 2017 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Sun Jul 23 14:00:17 2017 -0700

----------------------------------------------------------------------
 .../examples-java8/src/main/resources/archetype-resources/pom.xml   | 1 +
 .../examples/src/main/resources/archetype-resources/pom.xml         | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/a7c18495/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
index 4517861..af4fbd3 100644
--- a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
@@ -242,6 +242,7 @@
         <dependency>
           <groupId>org.apache.spark</groupId>
           <artifactId>spark-streaming_2.10</artifactId>
+          <version>${spark.version}</version>
           <scope>runtime</scope>
           <exclusions>
             <exclusion>

http://git-wip-us.apache.org/repos/asf/beam/blob/a7c18495/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 d039ddb..b8b9c9f 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
@@ -241,6 +241,7 @@
         <dependency>
           <groupId>org.apache.spark</groupId>
           <artifactId>spark-streaming_2.10</artifactId>
+          <version>${spark.version}</version>
           <scope>runtime</scope>
           <exclusions>
             <exclusion>


[2/2] beam git commit: [BEAM-2662] This closes #3620

Posted by jb...@apache.org.
[BEAM-2662] This closes #3620


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

Branch: refs/heads/master
Commit: 5f1d1365ba73aeac5a76a31c64ead2d7e94e4040
Parents: 49d4cf4 a7c1849
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Jul 24 06:57:27 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Jul 24 06:57:27 2017 +0200

----------------------------------------------------------------------
 .../examples-java8/src/main/resources/archetype-resources/pom.xml   | 1 +
 .../examples/src/main/resources/archetype-resources/pom.xml         | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------