From fee34d0bf67cfb77f2b1339dc46ece4bf519dd3a Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Fri, 15 Jun 2018 17:29:46 -0700 Subject: [PATCH] Fixed shading of pulsar-client and pulsar-client-admin (#1974) --- pom.xml | 6 +++ pulsar-client-admin-shaded/pom.xml | 39 ++++++++++++++++++- .../pulsar-client-kafka-shaded/pom.xml | 24 +++++++++++- pulsar-client-shaded/pom.xml | 23 ++++++++++- pulsar-common/pom.xml | 2 +- pulsar-functions/proto/pom.xml | 6 +++ 6 files changed, 94 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 90af15d81cd2f..cbfffd32d8307 100644 --- a/pom.xml +++ b/pom.xml @@ -348,6 +348,12 @@ flexible messaging model and an intuitive client API. ${jetty.version} + + org.eclipse.jetty + jetty-util + ${jetty.version} + + io.netty netty-all diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml index 839091f7eb35c..4f06fbb4485e8 100644 --- a/pulsar-client-admin-shaded/pom.xml +++ b/pulsar-client-admin-shaded/pom.xml @@ -57,6 +57,7 @@ + org.apache.pulsar:pulsar-functions-proto org.apache.pulsar:pulsar-io-core org.apache.pulsar:pulsar-client-original org.apache.pulsar:pulsar-client-admin-original @@ -84,7 +85,19 @@ javax.annotation:* org.glassfish.hk2*:* com.fasterxml.jackson.*:* - org.apache.avro:avro + io.grpc:* + com.yahoo.datasketches:* + io.netty:* + com.squareup.*:* + com.google.*:* + commons-*:* + org.apache.httpcomponents:* + org.eclipse.jetty:* + com.google.auth:* + org.jvnet.mimepull:* + io.opencensus:* + + org.apache.avro:* org.codehaus.jackson:jackson-core-asl org.codehaus.jackson:jackson-mapper-asl @@ -216,6 +229,30 @@ org.tukaani org.apache.pulsar.shade.org.tukaani + + io.grpc + org.apache.pulsar.shade.io.grpc + + + okio + org.apache.pulsar.shade.okio + + + com.squareup + org.apache.pulsar.shade.com.squareup + + + io.opencensus + org.apache.pulsar.shade.io.opencensus + + + org.eclipse.jetty + org.apache.pulsar.shade.org.eclipse.jetty + + + org.apache.http + org.apache.pulsar.shade.org.apache.http + diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml index 0bd9453da33ee..c8ec15420481d 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml @@ -83,7 +83,7 @@ com.fasterxml.jackson.core com.fasterxml.jackson.module io.netty:netty - io.netty:netty-all + io.netty:netty-* org.apache.pulsar:pulsar-common org.apache.bookkeeper:circe-checksum net.jpountz.lz4:lz4 @@ -91,7 +91,11 @@ org.apache.httpcomponents:httpclient commons-logging:commons-logging org.apache.httpcomponents:httpcore - org.apache.avro:avro + org.eclipse.jetty:* + com.yahoo.datasketches:* + commons-*:* + + org.apache.avro:* org.codehaus.jackson:jackson-core-asl org.codehaus.jackson:jackson-mapper-asl @@ -202,6 +206,22 @@ org.tukaani org.apache.pulsar.shade.org.tukaani + + org.eclipse.jetty + org.apache.pulsar.shade.org.eclipse + + + org.reactivestreams + org.apache.pulsar.shade.org.reactivestreams + + + com.typesafe + org.apache.pulsar.shade.com.typesafe + + + com.yahoo.memory + org.apache.pulsar.shade.com.yahoo.memory + diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index 3df4105b6a589..f88f90c33a5e6 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -78,7 +78,10 @@ io.netty:netty io.netty:netty-all io.netty:netty-tcnative-boringssl-static - + org.eclipse.jetty:* + com.yahoo.datasketches:* + commons-*:* + org.apache.pulsar:pulsar-common org.apache.bookkeeper:circe-checksum net.jpountz.lz4:lz4 @@ -86,7 +89,7 @@ org.apache.httpcomponents:httpclient commons-logging:commons-logging org.apache.httpcomponents:httpcore - org.apache.avro:avro + org.apache.avro:* org.codehaus.jackson:jackson-core-asl org.codehaus.jackson:jackson-mapper-asl @@ -196,6 +199,22 @@ org.tukaani org.apache.pulsar.shade.org.tukaani + + org.eclipse.jetty + org.apache.pulsar.shade.org.eclipse + + + org.reactivestreams + org.apache.pulsar.shade.org.reactivestreams + + + com.typesafe + org.apache.pulsar.shade.com.typesafe + + + com.yahoo.memory + org.apache.pulsar.shade.com.yahoo.memory + diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml index a7e0d57d31273..d8bece87c96f2 100644 --- a/pulsar-common/pom.xml +++ b/pulsar-common/pom.xml @@ -95,7 +95,7 @@ org.eclipse.jetty - jetty-server + jetty-util diff --git a/pulsar-functions/proto/pom.xml b/pulsar-functions/proto/pom.xml index aedb44776c386..57d50a60888fc 100644 --- a/pulsar-functions/proto/pom.xml +++ b/pulsar-functions/proto/pom.xml @@ -44,6 +44,12 @@ io.grpc grpc-all + + + io.netty + * + +