Avoid shading netty in managed-ledger-shaded (apache#2741)

* Avoid shading netty in managed-ledger-shaded * Fixed license file
iEverX · Oct 9, 2018 · 83da460 · 83da460
1 parent 90aa408
commit 83da460
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/managed-ledger-shaded/pom.xml b/managed-ledger-shaded/pom.xml
@@ -65,18 +65,14 @@
                                     <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>
                                     <include>com.google.protobuf:protobuf-java</include>
                                     <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
@@ -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