This is an automated email from the ASF dual-hosted git repository. mmerli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push: new 83da460 Avoid shading netty in managed-ledger-shaded (#2741) 83da460 is described below commit 83da460f63ea3a3429cdf6def8d8aa4c3aa52eeb Author: Matteo Merli <mme...@apache.org> AuthorDate: Tue Oct 9 12:18:19 2018 -0700 Avoid shading netty in managed-ledger-shaded (#2741) * Avoid shading netty in managed-ledger-shaded * Fixed license file --- managed-ledger-shaded/pom.xml | 14 +------------- pulsar-sql/presto-distribution/LICENSE | 2 ++ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/managed-ledger-shaded/pom.xml b/managed-ledger-shaded/pom.xml index cb3169e..a0df86f 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> @@ -143,13 +138,6 @@ <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> </relocation> diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 142f93f..ac2fbba 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