You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by GitBox <gi...@apache.org> on 2018/10/23 08:41:12 UTC
[GitHub] NicoK closed pull request #6461: [FLINK-9975][hadoop] also shade
Hadoop's io.netty dependency
NicoK closed pull request #6461: [FLINK-9975][hadoop] also shade Hadoop's io.netty dependency
URL: https://github.com/apache/flink/pull/6461
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml
index 797e06510d0..34b8fb94097 100644
--- a/flink-shaded-hadoop/pom.xml
+++ b/flink-shaded-hadoop/pom.xml
@@ -121,6 +121,7 @@ under the License.
<include>com.google.code.findbugs:*</include>
<include>asm:asm</include>
<include>io.netty:netty:*</include>
+ <include>io.netty:netty-all:*</include>
<include>org.apache.curator:*</include>
<include>org.apache.hadoop:*</include>
<include>org.htrace:htrace-core</include>
@@ -152,6 +153,10 @@ under the License.
<pattern>org.jboss.netty</pattern>
<shadedPattern>org.apache.flink.hadoop.shaded.org.jboss.netty</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>io.netty</pattern>
+ <shadedPattern>org.apache.flink.hadoop.shaded.io.netty</shadedPattern>
+ </relocation>
<relocation>
<pattern>org.apache.curator</pattern>
<shadedPattern>org.apache.flink.hadoop.shaded.org.apache.curator</shadedPattern>
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index f9abea92056..c09b0dd64ca 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -227,6 +227,10 @@ under the License.
<pattern>org.jboss.netty</pattern>
<shadedPattern>org.apache.flink.hadoop.shaded.org.jboss.netty</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>io.netty</pattern>
+ <shadedPattern>org.apache.flink.hadoop.shaded.io.netty</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</execution>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services