beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhalp...@apache.org
Subject [1/2] beam git commit: [BEAM-1379] Shade Guava in beam-sdks-java-io-kafka module
Date Fri, 03 Feb 2017 09:58:01 GMT
Repository: beam
Updated Branches:
  refs/heads/master 08e58e1df -> 8b0449450


[BEAM-1379] Shade Guava in beam-sdks-java-io-kafka module


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

Branch: refs/heads/master
Commit: a183cb9fe1f135e1efb9fc1b7b7aa448ff1854b8
Parents: 08e58e1
Author: Aviem Zur <aviemzur@gmail.com>
Authored: Thu Feb 2 17:08:27 2017 +0200
Committer: Dan Halperin <dhalperi@google.com>
Committed: Fri Feb 3 01:57:48 2017 -0800

----------------------------------------------------------------------
 runners/spark/pom.xml      |  4 ++--
 sdks/java/io/kafka/pom.xml | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/a183cb9f/runners/spark/pom.xml
----------------------------------------------------------------------
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index ffe6dfd..22ab027 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -383,11 +383,11 @@
                     version used by Hadoop (v11) -->
                   <relocation>
                     <pattern>com.google.common</pattern>
-                    <shadedPattern>org.apache.beam.spark.relocated.com.google.common</shadedPattern>
+                    <shadedPattern>org.apache.beam.spark.repackaged.com.google.common</shadedPattern>
                   </relocation>
                   <relocation>
                     <pattern>com.google.thirdparty</pattern>
-                    <shadedPattern>org.apache.beam.spark.relocated.com.google.thirdparty</shadedPattern>
+                    <shadedPattern>org.apache.beam.spark.repackaged.com.google.thirdparty</shadedPattern>
                   </relocation>
                 </relocations>
                 <transformers>

http://git-wip-us.apache.org/repos/asf/beam/blob/a183cb9f/sdks/java/io/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/kafka/pom.xml b/sdks/java/io/kafka/pom.xml
index 02150b2..65a6095 100644
--- a/sdks/java/io/kafka/pom.xml
+++ b/sdks/java/io/kafka/pom.xml
@@ -40,6 +40,35 @@
             <skip>true</skip>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <goals>
+                <goal>shade</goal>
+              </goals>
+              <configuration>
+                <artifactSet>
+                  <includes>
+                    <include>com.google.guava:guava</include>
+                  </includes>
+                </artifactSet>
+                <relocations>
+                  <relocation>
+                    <pattern>com.google.common</pattern>
+                    <shadedPattern>org.apache.beam.io.kafka.repackaged.com.google.common</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.google.thirdparty</pattern>
+                    <shadedPattern>org.apache.beam.io.kafka.repackaged.com.google.thirdparty</shadedPattern>
+                  </relocation>
+                </relocations>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -61,6 +90,10 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 


Mime
View raw message