[BEAM-11] relocate Guava used by Dataflow (v19) since it conflicts with version used by Hadoop (v11)
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/95ebf890 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/95ebf890 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/95ebf890 Branch: refs/heads/master Commit: 95ebf8905fcc5c7b2f8d68bf293d471c80524019 Parents: bde9933 Author: Sela <[email protected]> Authored: Mon Mar 14 18:50:37 2016 +0200 Committer: Sela <[email protected]> Committed: Tue Mar 15 20:40:18 2016 +0200 ---------------------------------------------------------------------- runners/spark/pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/95ebf890/runners/spark/pom.xml ---------------------------------------------------------------------- diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml index a060161..8d2704f 100644 --- a/runners/spark/pom.xml +++ b/runners/spark/pom.xml @@ -346,20 +346,20 @@ License. <goals> <goal>shade</goal> </goals> - <!--<configuration>--> - <!--<relocations>--> - <!--<!– relocate Guava used by Dataflow (v18) since it conflicts with version used by Hadoop (v11) –>--> - <!--<relocation>--> - <!--<pattern>com.google.common</pattern>--> - <!--<shadedPattern>com.cloudera.dataflow.spark.relocated.com.google.common</shadedPattern>--> - <!--</relocation>--> - <!--</relocations>--> - <!--<shadedArtifactAttached>true</shadedArtifactAttached>--> - <!--<shadedClassifierName>spark-app</shadedClassifierName>--> - <!--<transformers>--> - <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />--> - <!--</transformers>--> - <!--</configuration>--> + <configuration> + <relocations> + <!-- relocate Guava used by Dataflow (v18) since it conflicts with version used by Hadoop (v11) --> + <relocation> + <pattern>com.google.common</pattern> + <shadedPattern>org.apache.beam.spark.relocated.com.google.common</shadedPattern> + </relocation> + </relocations> + <shadedArtifactAttached>true</shadedArtifactAttached> + <shadedClassifierName>spark-app</shadedClassifierName> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + </transformers> + </configuration> </execution> </executions> </plugin>
