beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject [02/50] [abbrv] beam git commit: Fix shading of guava testlib
Date Mon, 24 Jul 2017 04:34:45 GMT
Fix shading of guava testlib


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

Branch: refs/heads/jstorm-runner
Commit: 3921163829d2a99b0524bf3fa1b85a4cde826f3a
Parents: f3540d4
Author: Dan Halperin <dhalperi@google.com>
Authored: Fri May 12 13:57:59 2017 -0700
Committer: Dan Halperin <dhalperi@google.com>
Committed: Fri May 12 14:59:10 2017 -0700

----------------------------------------------------------------------
 pom.xml                     | 4 ++++
 runners/direct-java/pom.xml | 4 ++++
 sdks/java/core/pom.xml      | 4 ++++
 3 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/39211638/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eaca6b7..a978f58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1446,6 +1446,10 @@
                 <relocations>
                   <relocation>
                     <pattern>com.google.common</pattern>
+                    <excludes>
+                      <!-- com.google.common is too generic, need to exclude guava-testlib
-->
+                      <exclude>com.google.common.**.testing.*</exclude>
+                    </excludes>
                     <!--suppress MavenModelInspection -->
                     <shadedPattern>
                       org.apache.${renderedArtifactId}.repackaged.com.google.common

http://git-wip-us.apache.org/repos/asf/beam/blob/39211638/runners/direct-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml
index 0daa066..c581113 100644
--- a/runners/direct-java/pom.xml
+++ b/runners/direct-java/pom.xml
@@ -131,6 +131,10 @@
                 </relocation>
                 <relocation>
                   <pattern>com.google.common</pattern>
+                  <excludes>
+                    <!-- com.google.common is too generic, need to exclude guava-testlib
-->
+                    <exclude>com.google.common.**.testing.*</exclude>
+                  </excludes>
                   <shadedPattern>
                     org.apache.beam.runners.direct.repackaged.com.google.common
                   </shadedPattern>

http://git-wip-us.apache.org/repos/asf/beam/blob/39211638/sdks/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index 68d76e1..882657b 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -161,6 +161,10 @@
               <relocations>
                 <relocation>
                   <pattern>com.google.common</pattern>
+                  <excludes>
+                    <!-- com.google.common is too generic, need to exclude guava-testlib
-->
+                    <exclude>com.google.common.**.testing.*</exclude>
+                  </excludes>
                   <!--suppress MavenModelInspection -->
                   <shadedPattern>
                     org.apache.beam.sdk.repackaged.com.google.common


Mime
View raw message