You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2016/06/22 09:44:22 UTC
flink git commit: [FLINK-4091] Fix Guava shading in Cassandra
connector
Repository: flink
Updated Branches:
refs/heads/master bce3a68d9 -> 7e206f490
[FLINK-4091] Fix Guava shading in Cassandra connector
This closes #2133
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7e206f49
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7e206f49
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7e206f49
Branch: refs/heads/master
Commit: 7e206f490e17c47101edeb6c0950b0d36042fe2f
Parents: bce3a68
Author: zentol <ch...@apache.org>
Authored: Mon Jun 20 11:15:45 2016 +0200
Committer: zentol <ch...@apache.org>
Committed: Wed Jun 22 11:43:49 2016 +0200
----------------------------------------------------------------------
flink-streaming-connectors/flink-connector-cassandra/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7e206f49/flink-streaming-connectors/flink-connector-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/flink-streaming-connectors/flink-connector-cassandra/pom.xml b/flink-streaming-connectors/flink-connector-cassandra/pom.xml
index bfd712b..4175697 100644
--- a/flink-streaming-connectors/flink-connector-cassandra/pom.xml
+++ b/flink-streaming-connectors/flink-connector-cassandra/pom.xml
@@ -68,12 +68,13 @@ under the License.
<includes>
<include>com.datastax.cassandra:cassandra-driver-core</include>
<include>com.datastax.cassandra:cassandra-driver-mapping</include>
+ <include>com.google.guava:guava</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>com.google</pattern>
- <shadedPattern>org.apache.flink.shaded.com.google</shadedPattern>
+ <shadedPattern>org.apache.flink.cassandra.shaded.com.google</shadedPattern>
<excludes>
<exclude>com.google.protobuf.**</exclude>
<exclude>com.google.inject.**</exclude>