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/12/16 16:28:49 UTC
[1/2] incubator-beam git commit: Closes #1633
Repository: incubator-beam
Updated Branches:
refs/heads/master 5ebbd500c -> 33b7ca792
Closes #1633
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/33b7ca79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/33b7ca79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/33b7ca79
Branch: refs/heads/master
Commit: 33b7ca7924e6f3ac7e5a9380e6330de3c316c138
Parents: 5ebbd50 235027b
Author: Dan Halperin <dh...@google.com>
Authored: Fri Dec 16 08:28:40 2016 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Fri Dec 16 08:28:40 2016 -0800
----------------------------------------------------------------------
runners/core-java/pom.xml | 4 ++--
runners/google-cloud-dataflow-java/pom.xml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-beam git commit: [BEAM-450] Shade modules to separate
paths
Posted by dh...@apache.org.
[BEAM-450] Shade modules to separate paths
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/235027b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/235027b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/235027b9
Branch: refs/heads/master
Commit: 235027b9fc6e322c469b099d168e60bf72a567db
Parents: 5ebbd50
Author: Dan Halperin <dh...@google.com>
Authored: Thu Dec 15 13:50:39 2016 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Fri Dec 16 08:28:40 2016 -0800
----------------------------------------------------------------------
runners/core-java/pom.xml | 4 ++--
runners/google-cloud-dataflow-java/pom.xml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/235027b9/runners/core-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/core-java/pom.xml b/runners/core-java/pom.xml
index b5c610b..704aeaf 100644
--- a/runners/core-java/pom.xml
+++ b/runners/core-java/pom.xml
@@ -90,11 +90,11 @@
the second relocation. -->
<relocation>
<pattern>com.google.common</pattern>
- <shadedPattern>org.apache.beam.sdk.repackaged.com.google.common</shadedPattern>
+ <shadedPattern>org.apache.beam.runners.core.repackaged.com.google.common</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.thirdparty</pattern>
- <shadedPattern>org.apache.beam.sdk.repackaged.com.google.thirdparty</shadedPattern>
+ <shadedPattern>org.apache.beam.runners.core.repackaged.com.google.thirdparty</shadedPattern>
</relocation>
</relocations>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/235027b9/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 77187d6..46ac7ef 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -133,15 +133,15 @@
<!-- com.google.common is too generic, need to exclude guava-testlib -->
<exclude>com.google.common.**.testing.*</exclude>
</excludes>
- <shadedPattern>org.apache.beam.sdk.repackaged.com.google.common</shadedPattern>
+ <shadedPattern>org.apache.beam.runners.dataflow.repackaged.com.google.common</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.thirdparty</pattern>
- <shadedPattern>org.apache.beam.sdk.repackaged.com.google.thirdparty</shadedPattern>
+ <shadedPattern>org.apache.beam.runners.dataflow.repackaged.com.google.thirdparty</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.cloud.bigtable</pattern>
- <shadedPattern>org.apache.beam.sdk.repackaged.com.google.cloud.bigtable</shadedPattern>
+ <shadedPattern>org.apache.beam.runners.dataflow.repackaged.com.google.cloud.bigtable</shadedPattern>
<excludes>
<exclude>com.google.cloud.bigtable.config.BigtableOptions*</exclude>
<exclude>com.google.cloud.bigtable.config.CredentialOptions*</exclude>