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 2017/02/09 03:01:20 UTC

[1/2] beam git commit: [BEAM-1411] Shade Guava in beam-sdks-java-io-hdfs module

Repository: beam
Updated Branches:
  refs/heads/master 591118e66 -> d17d2db1d


[BEAM-1411] Shade Guava in beam-sdks-java-io-hdfs module


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

Branch: refs/heads/master
Commit: 1a8664665b1c119cecbceedf698295eaabc467f8
Parents: 591118e
Author: Michael Luckey <mi...@ext.gfk.com>
Authored: Thu Feb 9 01:31:47 2017 +0100
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Feb 8 19:01:00 2017 -0800

----------------------------------------------------------------------
 sdks/java/io/hdfs/pom.xml | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/1a866466/sdks/java/io/hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/hdfs/pom.xml b/sdks/java/io/hdfs/pom.xml
index 48c269f..0fa5021 100644
--- a/sdks/java/io/hdfs/pom.xml
+++ b/sdks/java/io/hdfs/pom.xml
@@ -31,6 +31,40 @@
   <description>Library to read and write Hadoop/HDFS file formats from Beam.</description>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <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.sdk.io.hdfs.repackaged.com.google.common</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.google.thirdparty</pattern>
+                    <shadedPattern>org.apache.beam.sdk.io.hdfs.repackaged.com.google.thirdparty</shadedPattern>
+                  </relocation>
+                </relocations>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -49,6 +83,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>
 


[2/2] beam git commit: This closes #1954

Posted by dh...@apache.org.
This closes #1954


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

Branch: refs/heads/master
Commit: d17d2db1d1379aa48afed5267234d9141aa1d9b4
Parents: 591118e 1a86646
Author: Dan Halperin <dh...@google.com>
Authored: Wed Feb 8 19:01:09 2017 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Feb 8 19:01:09 2017 -0800

----------------------------------------------------------------------
 sdks/java/io/hdfs/pom.xml | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
----------------------------------------------------------------------