[beam] branch master updated: [BEAM-5723] Avoid relocating guava for CassandraIO

[ie...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iemejia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new a7d53e7  [BEAM-5723] Avoid relocating guava for CassandraIO
     new ad00c99  Merge pull request #7237: [BEAM-5723] Avoid relocating guava for CassandraIO
a7d53e7 is described below

commit a7d53e7d3aa1157e680c2844d676a127bdad864d
Author: João Cabrita <ke...@protonmail.com>
AuthorDate: Mon Dec 10 11:24:38 2018 +0000

    [BEAM-5723] Avoid relocating guava for CassandraIO
---
 sdks/java/io/cassandra/build.gradle | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sdks/java/io/cassandra/build.gradle b/sdks/java/io/cassandra/build.gradle
index 2578e3b..3494147 100644
--- a/sdks/java/io/cassandra/build.gradle
+++ b/sdks/java/io/cassandra/build.gradle
@@ -17,7 +17,12 @@
  */
 
 apply plugin: org.apache.beam.gradle.BeamModulePlugin
-applyJavaNature()
+// Do not relocate guava to avoid issues with Cassandra's version.
+applyJavaNature(shadowClosure: DEFAULT_SHADOW_CLOSURE << {
+  dependencies {
+    exclude(dependency(project.library.java.guava))
+  }
+})
 provideIntegrationTestingDependencies()
 enableJavaPerformanceTesting()