You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2017/12/20 17:22:41 UTC

flink git commit: [FLINK-8295] [cassandra] [build] Properly shade netty for the datastax driver

Repository: flink
Updated Branches:
  refs/heads/master 2142eeda9 -> 1a98e327e


[FLINK-8295] [cassandra] [build] Properly shade netty for the datastax driver

com.datastax.driver.core.NettyUtil expects netty to be present either at its
original package or relocated to com.datastax.shaded.netty. By relocating it
to this package we make sure the driver follows its designated path.

This closes #5183.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1a98e327
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1a98e327
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1a98e327

Branch: refs/heads/master
Commit: 1a98e327ea504f1422935c12a3342997145b9292
Parents: 2142eed
Author: Nico Kruber <ni...@data-artisans.com>
Authored: Tue Dec 19 18:14:19 2017 +0100
Committer: twalthr <tw...@apache.org>
Committed: Wed Dec 20 18:21:24 2017 +0100

----------------------------------------------------------------------
 flink-connectors/flink-connector-cassandra/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/1a98e327/flink-connectors/flink-connector-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-cassandra/pom.xml b/flink-connectors/flink-connector-cassandra/pom.xml
index 1ead7e4..0fbd968 100644
--- a/flink-connectors/flink-connector-cassandra/pom.xml
+++ b/flink-connectors/flink-connector-cassandra/pom.xml
@@ -84,13 +84,13 @@ under the License.
 									</excludes>
 								</relocation>
 								<!--
-									For the details of relocation pattern, refer the discussion at
-									https://github.com/apache/flink/pull/4545
-									FLINK-6805
+									Relocate to datastax' package where it
+									expects shaded netty versions; see
+									https://issues.apache.org/jira/browse/FLINK-8295
 								-->
 								<relocation>
 									<pattern>io.netty</pattern>
-									<shadedPattern>org.apache.flink.cassandra.shaded.io.netty</shadedPattern>
+									<shadedPattern>com.datastax.shaded.netty</shadedPattern>
 								</relocation>
 							</relocations>
 						</configuration>