You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/08/17 17:06:14 UTC
[1/2] incubator-beam git commit: Fix repackaging exclude pattern for
guava-testlib
Repository: incubator-beam
Updated Branches:
refs/heads/master 9b4a464a3 -> 46097736b
Fix repackaging exclude pattern for guava-testlib
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/2a8ceed6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/2a8ceed6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/2a8ceed6
Branch: refs/heads/master
Commit: 2a8ceed623e7909e0d67b71263e255e10a1c7693
Parents: 9b4a464
Author: Scott Wegner <sw...@google.com>
Authored: Wed Aug 17 09:28:44 2016 -0700
Committer: Scott Wegner <sw...@google.com>
Committed: Wed Aug 17 09:28:44 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
runners/direct-java/pom.xml | 4 ++--
runners/google-cloud-dataflow-java/pom.xml | 4 ++--
sdks/java/core/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2a8ceed6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b5f30c1..f39f94a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -634,7 +634,7 @@
<dependency>
<!-- Note: when relocating guava, ensure guava-testlib is not also relocated by
- excluding com.google.common.**.testing -->
+ excluding com.google.common.**.testing.* -->
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>${guava.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2a8ceed6/runners/direct-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml
index 11481f1..e06883f 100644
--- a/runners/direct-java/pom.xml
+++ b/runners/direct-java/pom.xml
@@ -194,7 +194,7 @@
<pattern>com.google.common</pattern>
<excludes>
<!-- com.google.common is too generic, need to exclude guava-testlib -->
- <exclude>com.google.common.**.testing</exclude>
+ <exclude>com.google.common.**.testing.*</exclude>
</excludes>
<shadedPattern>org.apache.beam.runners.direct.repackaged.com.google.common</shadedPattern>
</relocation>
@@ -269,7 +269,7 @@
<dependency>
<!-- Note: when relocating guava, ensure guava-testlib is not also relocated by
- excluding com.google.common.**.testing -->
+ excluding com.google.common.**.testing.* -->
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2a8ceed6/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 d5485ef..00b5a9b 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -198,7 +198,7 @@
<pattern>com.google.common</pattern>
<excludes>
<!-- com.google.common is too generic, need to exclude guava-testlib -->
- <exclude>com.google.common.**.testing</exclude>
+ <exclude>com.google.common.**.testing.*</exclude>
</excludes>
<shadedPattern>org.apache.beam.sdk.repackaged.com.google.common</shadedPattern>
</relocation>
@@ -315,7 +315,7 @@
<dependency>
<!-- Note: when relocating guava, ensure guava-testlib is not also relocated by
- excluding com.google.common.**.testing -->
+ excluding com.google.common.**.testing.* -->
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2a8ceed6/sdks/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index fddccea..78aec85 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -195,7 +195,7 @@
<pattern>com.google.common</pattern>
<excludes>
<!-- com.google.common is too generic, need to exclude guava-testlib -->
- <exclude>com.google.common.**.testing</exclude>
+ <exclude>com.google.common.**.testing.*</exclude>
</excludes>
<shadedPattern>org.apache.beam.sdk.repackaged.com.google.common</shadedPattern>
</relocation>
@@ -426,7 +426,7 @@
<dependency>
<!-- Note: when relocating guava, ensure guava-testlib is not also relocated by
- excluding com.google.common.**.testing -->
+ excluding com.google.common.**.testing.* -->
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<scope>test</scope>
[2/2] incubator-beam git commit: [BEAM-557] Fix repackaging exclude
pattern for guava-testlib
Posted by lc...@apache.org.
[BEAM-557] Fix repackaging exclude pattern for guava-testlib
This closes #842
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/46097736
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/46097736
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/46097736
Branch: refs/heads/master
Commit: 46097736b5af336b3f43a743eecc2a45041c6bf5
Parents: 9b4a464 2a8ceed
Author: Luke Cwik <lc...@google.com>
Authored: Wed Aug 17 09:38:02 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Wed Aug 17 09:38:02 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
runners/direct-java/pom.xml | 4 ++--
runners/google-cloud-dataflow-java/pom.xml | 4 ++--
sdks/java/core/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------