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/06/21 18:54:57 UTC
[1/3] incubator-beam git commit: Set runtime scope for Dataflow
runner dep on runners-core
Repository: incubator-beam
Updated Branches:
refs/heads/master 3001804e3 -> 73862b422
Set runtime scope for Dataflow runner dep on runners-core
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/b52688f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/b52688f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/b52688f4
Branch: refs/heads/master
Commit: b52688f4e41e0130ac5947e7771ad8606aa9913c
Parents: 2d56379
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon Jun 20 15:05:59 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Jun 21 10:21:53 2016 -0700
----------------------------------------------------------------------
runners/google-cloud-dataflow-java/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b52688f4/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 6d8e94b..999e16d 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -299,6 +299,7 @@
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-runners-core-java</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
[2/3] incubator-beam git commit: Remove temporary
GroupAlsoByWindowViaWindowSetDoFn shim
Posted by ke...@apache.org.
Remove temporary GroupAlsoByWindowViaWindowSetDoFn shim
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/2d563795
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/2d563795
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/2d563795
Branch: refs/heads/master
Commit: 2d563795b9ec3ec70f53980afa5bb2a50fd24518
Parents: 2b9906e
Author: Kenneth Knowles <kl...@google.com>
Authored: Tue Jun 21 10:21:34 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Jun 21 10:21:53 2016 -0700
----------------------------------------------------------------------
.../util/GroupAlsoByWindowViaWindowSetDoFn.java | 40 --------------------
1 file changed, 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2d563795/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/util/GroupAlsoByWindowViaWindowSetDoFn.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/util/GroupAlsoByWindowViaWindowSetDoFn.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/util/GroupAlsoByWindowViaWindowSetDoFn.java
deleted file mode 100644
index 42ebf94..0000000
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/util/GroupAlsoByWindowViaWindowSetDoFn.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.beam.sdk.util;
-
-import org.apache.beam.sdk.transforms.DoFn;
-import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
-import org.apache.beam.sdk.values.KV;
-
-/**
- * Stub class that exists for compatibility with code expecting
- * {@link org.apache.beam.runners.core.GroupAlsoByWindowViaWindowSetDoFn} in the old location.
- */
-public class GroupAlsoByWindowViaWindowSetDoFn {
-
- public static <K, InputT, OutputT, W extends BoundedWindow>
- DoFn<KeyedWorkItem<K, InputT>, KV<K, OutputT>> create(
- WindowingStrategy<?, W> strategy, SystemReduceFn<K, InputT, ?, OutputT, W> reduceFn) {
- return org.apache.beam.runners.core.GroupAlsoByWindowViaWindowSetDoFn.create(
- strategy, reduceFn);
- }
-
- /** Prohibit instantiation. */
- private GroupAlsoByWindowViaWindowSetDoFn() {}
-}
-
[3/3] incubator-beam git commit: This closes #509
Posted by ke...@apache.org.
This closes #509
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/73862b42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/73862b42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/73862b42
Branch: refs/heads/master
Commit: 73862b422130b35dfc5f012dbb55e1a9a62be55c
Parents: 3001804 b52688f
Author: Kenneth Knowles <kl...@google.com>
Authored: Tue Jun 21 11:54:40 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Jun 21 11:54:40 2016 -0700
----------------------------------------------------------------------
runners/google-cloud-dataflow-java/pom.xml | 1 +
.../util/GroupAlsoByWindowViaWindowSetDoFn.java | 40 --------------------
2 files changed, 1 insertion(+), 40 deletions(-)
----------------------------------------------------------------------