You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2016/10/31 17:39:45 UTC
[1/3] incubator-beam git commit: Update shade plugin version to avoid
ASM bug
Repository: incubator-beam
Updated Branches:
refs/heads/master 54a737402 -> d8eb8be13
Update shade plugin version to avoid ASM bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1e5de72f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1e5de72f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1e5de72f
Branch: refs/heads/master
Commit: 1e5de72f5948a80ac237832df56ae5e4ea0f3553
Parents: 63cbb97
Author: Eugene Kirpichov <ki...@google.com>
Authored: Fri Oct 28 17:42:04 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Oct 31 10:25:48 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
runners/core-java/pom.xml | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1e5de72f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 01de58e..453e57c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1096,7 +1096,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1e5de72f/runners/core-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/core-java/pom.xml b/runners/core-java/pom.xml
index 5f7ec08..0601512 100644
--- a/runners/core-java/pom.xml
+++ b/runners/core-java/pom.xml
@@ -94,7 +94,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.1</version>
<executions>
<!-- In the first phase, we pick dependencies and relocate them. -->
<execution>
[2/3] incubator-beam git commit: Fixes a compile error in SourceRDD
Posted by ke...@apache.org.
Fixes a compile error in SourceRDD
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/63cbb974
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/63cbb974
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/63cbb974
Branch: refs/heads/master
Commit: 63cbb9742d836dff250ba6d8d447dc54d5b76a54
Parents: 54a7374
Author: Eugene Kirpichov <ki...@google.com>
Authored: Fri Oct 28 15:21:00 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Oct 31 10:25:48 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/runners/spark/io/SourceRDD.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/63cbb974/runners/spark/src/main/java/org/apache/beam/runners/spark/io/SourceRDD.java
----------------------------------------------------------------------
diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/io/SourceRDD.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/io/SourceRDD.java
index 3995c89..cf37b3a 100644
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/io/SourceRDD.java
+++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/io/SourceRDD.java
@@ -216,8 +216,10 @@ public class SourceRDD {
private final MicrobatchSource<T, CheckpointMarkT> microbatchSource;
private final SparkRuntimeContext runtimeContext;
+ // to satisfy Scala API.
private static final scala.collection.immutable.List<Dependency<?>> NIL =
- scala.collection.immutable.List.empty();
+ scala.collection.JavaConversions
+ .asScalaBuffer(Collections.<Dependency<?>>emptyList()).toList();
public Unbounded(SparkContext sc,
SparkRuntimeContext runtimeContext,
[3/3] incubator-beam git commit: This closes #1226
Posted by ke...@apache.org.
This closes #1226
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/d8eb8be1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/d8eb8be1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/d8eb8be1
Branch: refs/heads/master
Commit: d8eb8be13737d625d03ce1bbb012f0a57e0260d3
Parents: 54a7374 1e5de72
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon Oct 31 10:25:50 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Oct 31 10:25:50 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
runners/core-java/pom.xml | 1 -
.../main/java/org/apache/beam/runners/spark/io/SourceRDD.java | 4 +++-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------