This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
commit 8620d20c9511b3a7bfcbecf7e6aba7adba79c8ce Author: Chesnay Schepler <[email protected]> AuthorDate: Mon Oct 4 15:54:55 2021 +0200 [FLINK-24447][zk] Bundle netty --- .../flink-shaded-zookeeper-35/pom.xml | 12 +++++++----- .../src/main/resources/META-INF/NOTICE | 8 ++++++++ flink-shaded-zookeeper-parent/pom.xml | 5 +++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml index cfd3b38..b42fb45 100644 --- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml +++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml @@ -44,11 +44,6 @@ under the License. <artifactId>zookeeper</artifactId> <exclusions> <exclusion> - <!-- only required for ZK servers, not clients --> - <groupId>io.netty</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> <!-- Flink distribution provides logging classes --> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -121,6 +116,13 @@ under the License. <artifactId>zookeeper</artifactId> <version>${zookeeper.version}</version> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-bom</artifactId> + <version>${netty.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> </dependencies> </dependencyManagement> </project> \ No newline at end of file diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE index 17bdeef..c14a7fb 100644 --- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE +++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE @@ -7,6 +7,14 @@ The Apache Software Foundation (http://www.apache.org/). This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - com.google.guava:guava:27.0.1-jre +- io.netty:netty-buffer:4.1.65.Final +- io.netty:netty-codec:4.1.65.Final +- io.netty:netty-common:4.1.65.Final +- io.netty:netty-handler:4.1.65.Final +- io.netty:netty-resolver:4.1.65.Final +- io.netty:netty-transport:4.1.65.Final +- io.netty:netty-transport-native-epoll:4.1.65.Final +- io.netty:netty-transport-native-unix-common:4.1.65.Final - org.apache.curator:curator-client:4.2.0 - org.apache.curator:curator-framework:4.2.0 - org.apache.curator:curator-recipes:4.2.0 diff --git a/flink-shaded-zookeeper-parent/pom.xml b/flink-shaded-zookeeper-parent/pom.xml index 264f353..5c9d756 100644 --- a/flink-shaded-zookeeper-parent/pom.xml +++ b/flink-shaded-zookeeper-parent/pom.xml @@ -69,6 +69,11 @@ under the License. <shadedPattern>${shading.zookeeper.prefix}.org.apache.zookeeper</shadedPattern> </relocation> <relocation> + <!-- This allows us to re-use flink-shaded-netty --> + <pattern>io.netty</pattern> + <shadedPattern>${shading.zookeeper.prefix}.io.netty</shadedPattern> + </relocation> + <relocation> <pattern>org.apache.jute</pattern> <shadedPattern>${shading.zookeeper.prefix}.org.apache.jute</shadedPattern> </relocation>
