Repository: incubator-beam Updated Branches: refs/heads/master 9a3896d69 -> ce87f377b
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/e0035936 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/e0035936 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/e0035936 Branch: refs/heads/master Commit: e003593612e28465f515e8399b4c4827d50fe787 Parents: 9a3896d Author: Dan Halperin <[email protected]> Authored: Tue Jun 7 23:26:46 2016 -0700 Committer: Davor Bonaci <[email protected]> Committed: Wed Jun 8 09:16:00 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/e0035936/runners/direct-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index f59fcb9..fb2d2e1 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/e0035936/runners/spark/pom.xml ---------------------------------------------------------------------- diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml index a3aadfb..4110689 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>
