beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhalp...@apache.org
Subject [3/4] incubator-beam git commit: Fix pom shading of Guava
Date Wed, 08 Jun 2016 17:39:12 GMT
Fix pom shading of Guava

There are two packages: com.google.common and com.google.thirdparty.
Both need to be repackaged/relocated, but we only had com.google.common
in a few places.


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

Branch: refs/heads/release-0.1.0-incubating
Commit: 35098dc6971ad0a195dcfbd23979dc82d482b2c9
Parents: 340ad4a
Author: Dan Halperin <dhalperi@google.com>
Authored: Tue Jun 7 23:26:46 2016 -0700
Committer: Dan Halperin <dhalperi@google.com>
Committed: Wed Jun 8 10:35:20 2016 -0700

----------------------------------------------------------------------
 runners/direct-java/pom.xml | 4 ++++
 runners/spark/pom.xml       | 4 ++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35098dc6/runners/direct-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml
index 98b0e20..0a248d3 100644
--- a/runners/direct-java/pom.xml
+++ b/runners/direct-java/pom.xml
@@ -201,6 +201,10 @@
                   <pattern>com.google.common</pattern>
                   <shadedPattern>org.apache.beam.runners.direct.repackaged.com.google.common</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>com.google.thirdparty</pattern>
+                  <shadedPattern>org.apache.beam.runners.direct.repackaged.com.google.thirdparty</shadedPattern>
+                </relocation>
               </relocations>
             </configuration>
           </execution>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35098dc6/runners/spark/pom.xml
----------------------------------------------------------------------
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index 1989d5f..b626b9f 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -187,6 +187,10 @@
                     <pattern>com.google.common</pattern>
                     <shadedPattern>org.apache.beam.spark.relocated.com.google.common</shadedPattern>
                   </relocation>
+                  <relocation>
+                    <pattern>com.google.thirdparty</pattern>
+                    <shadedPattern>org.apache.beam.spark.relocated.com.google.thirdparty</shadedPattern>
+                  </relocation>
                 </relocations>
                 <shadedArtifactAttached>true</shadedArtifactAttached>
                 <shadedClassifierName>spark-app</shadedClassifierName>


Mime
View raw message