From f852eccd24b44ceece6e74bc06c24a77a9acb151 Mon Sep 17 00:00:00 2001
From: Michael Fong <mcfong.open@gmail.com>
Date: Tue, 15 Aug 2017 14:22:23 +0800
Subject: [PATCH 1/2] [FLINK-6805] [Cassandra-Connector] Shade indirect netty4
 dep

To relocate various *indirect* netty4 dep of ver 4.0.33.Final to
classpath of Flink flavor using Maven shade plugin.
---
 flink-connectors/flink-connector-cassandra/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/flink-connectors/flink-connector-cassandra/pom.xml b/flink-connectors/flink-connector-cassandra/pom.xml
index f006f3ab576e66..c40f98507fa993 100644
--- a/flink-connectors/flink-connector-cassandra/pom.xml
+++ b/flink-connectors/flink-connector-cassandra/pom.xml
@@ -39,6 +39,7 @@ under the License.
 	<properties>
 		<cassandra.version>2.2.5</cassandra.version>
 		<driver.version>3.0.0</driver.version>
+		<netty4.version>4.0.27.Final</netty4.version>
 	</properties>
 
 	<build>
@@ -72,6 +73,7 @@ under the License.
 									<include>com.datastax.cassandra:cassandra-driver-core</include>
 									<include>com.datastax.cassandra:cassandra-driver-mapping</include>
 									<include>com.google.guava:guava</include>
+									<include>io.netty:netty-*</include>
 								</includes>
 							</artifactSet>
 							<relocations>
@@ -83,6 +85,10 @@ under the License.
 										<exclude>com.google.inject.**</exclude>
 									</excludes>
 								</relocation>
+								<relocation>
+									<pattern>io.netty</pattern>
+									<shadedPattern>org.apache.flink.shaded.netty4.io.netty</shadedPattern>
+								</relocation>
 							</relocations>
 						</configuration>
 					</execution>

From 3e5637dd8c35da264cf88ae280482b41f19af3c4 Mon Sep 17 00:00:00 2001
From: Michael Fong <mcfong.open@gmail.com>
Date: Wed, 16 Aug 2017 21:06:58 +0800
Subject: [PATCH 2/2] [FLINK-6805] [Cassandra-Connector] Shade cassandra netty4
 dep

To relocate the indirect netty4 dep to customized classpath w.r.t.
cassandra using Maven shade plugin.
---
 flink-connectors/flink-connector-cassandra/pom.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/flink-connectors/flink-connector-cassandra/pom.xml b/flink-connectors/flink-connector-cassandra/pom.xml
index c40f98507fa993..c97b43fd25174e 100644
--- a/flink-connectors/flink-connector-cassandra/pom.xml
+++ b/flink-connectors/flink-connector-cassandra/pom.xml
@@ -39,7 +39,6 @@ under the License.
 	<properties>
 		<cassandra.version>2.2.5</cassandra.version>
 		<driver.version>3.0.0</driver.version>
-		<netty4.version>4.0.27.Final</netty4.version>
 	</properties>
 
 	<build>
@@ -85,9 +84,14 @@ under the License.
 										<exclude>com.google.inject.**</exclude>
 									</excludes>
 								</relocation>
+								<!--
+									For the details of relocation pattern, refer the discussion at
+									https://github.com/apache/flink/pull/4545
+									FLINK-6805
+								-->
 								<relocation>
 									<pattern>io.netty</pattern>
-									<shadedPattern>org.apache.flink.shaded.netty4.io.netty</shadedPattern>
+									<shadedPattern>org.apache.flink.cassandra.shaded.io.netty</shadedPattern>
 								</relocation>
 							</relocations>
 						</configuration>