merlimat closed pull request #2741: Avoid shading netty in managed-ledger-shaded URL: https://github.com/apache/pulsar/pull/2741
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/managed-ledger-shaded/pom.xml b/managed-ledger-shaded/pom.xml index cb3169e173..a0df86f406 100644 --- a/managed-ledger-shaded/pom.xml +++ b/managed-ledger-shaded/pom.xml @@ -65,9 +65,7 @@ <include>org.apache.commons:commons-lang3</include> <include>commons-codec:commons-codec</include> <include>commons-collections:commons-collections</include> -] <include>org.asynchttpclient:*</include> - <include>io.netty:netty-codec-http</include> - <include>io.netty:netty-transport-native-epoll</include> + <include>org.asynchttpclient:*</include> <include>org.reactivestreams:reactive-streams</include> <include>com.typesafe.netty:netty-reactive-streams</include> <include>org.javassist:javassist</include> @@ -75,8 +73,6 @@ <include>com.google.guava:guava</include> <include>com.google.code.gson:gson</include> <include>com.fasterxml.jackson.core</include> - <include>io.netty:netty</include> - <include>io.netty:netty-all</include> <include>org.apache.pulsar:pulsar-common</include> <include>com.yahoo.datasketches:sketches-core</include> <include>org.glassfish.jersey*:*</include> @@ -86,7 +82,6 @@ <include>com.fasterxml.jackson.*:*</include> <include>io.grpc:*</include> <include>com.yahoo.datasketches:*</include> - <include>io.netty:*</include> <include>com.squareup.*:*</include> <include>com.google.*:*</include> <include>commons-*:*</include> @@ -142,13 +137,6 @@ <pattern>com.fasterxml.jackson</pattern> <shadedPattern>org.apache.pulsar.shade.com.fasterxml.jackson</shadedPattern> </relocation> - <relocation> - <pattern>io.netty</pattern> - <shadedPattern>org.apache.pulsar.shade.io.netty</shadedPattern> - <excludes> - <exclude>io.netty.buffer.ByteBuf</exclude> - </excludes> - </relocation> <relocation> <pattern>org.apache.pulsar.policies</pattern> <shadedPattern>org.apache.pulsar.shade.org.apache.pulsar.policies</shadedPattern> diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 142f93f425..ac2fbbae69 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -245,6 +245,8 @@ The Apache Software License, Version 2.0 - commons-lang-2.4.jar - commons-logging-1.1.1.jar * Netty + - netty-all-4.1.22.Final.jar + - netty-tcnative-boringssl-static-2.0.7.Final.jar - netty-3.6.2.Final.jar * Joda Time - joda-time-2.9.9.jar ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services