This is an automated email from the ASF dual-hosted git repository.
sanjeevrk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new edaaafc Improve pulsar-client shading (#2006)
edaaafc is described below
commit edaaafc50391f44d79ae16b6f35e664ced7f5dc5
Author: Sijie Guo <[email protected]>
AuthorDate: Thu Jun 21 01:10:19 2018 -0700
Improve pulsar-client shading (#2006)
* Improve pulsar-client shading
*Motivation*
- we should not shade `org.apache.pulsar.common` classes, since they will
be used by pulsar api
- Change the shading rules for pulsar-client-admin to make sure they have
same shading rules as client, so they can be used together.
*Changes*
- Exclude `org.apache.pulsar.common` from pulsar-client shading rule
- Change shade class prefix for `pulsar-client-admin`
* Use pulsar-client-original in s3-offload integration
---
pulsar-client-admin-shaded/pom.xml | 40 ++++++++++++++++++------------------
pulsar-client-shaded/pom.xml | 4 ----
tests/integration/s3-offload/pom.xml | 2 +-
3 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/pulsar-client-admin-shaded/pom.xml
b/pulsar-client-admin-shaded/pom.xml
index 4f06fbb..5197963 100644
--- a/pulsar-client-admin-shaded/pom.xml
+++ b/pulsar-client-admin-shaded/pom.xml
@@ -130,83 +130,83 @@
<relocations>
<relocation>
<pattern>org.asynchttpclient</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.org.asynchttpclient</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.org.asynchttpclient</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.org.apache.commons</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern>
</relocation>
<relocation>
<pattern>com.google</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.com.google</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.com.google</shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.com.fasterxml.jackson</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.com.fasterxml.jackson</shadedPattern>
</relocation>
<relocation>
<pattern>io.netty</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.io.netty</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.io.netty</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.pulsar.policies</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.org.apache.pulsar.policies</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.pulsar.policies</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.pulsar.checksum</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.org.apache.pulsar.checksum</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.org.apache.pulsar.checksum</shadedPattern>
</relocation>
<relocation>
<pattern>com.scurrilous.circe</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.com.scurrilous.circe</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.com.scurrilous.circe</shadedPattern>
</relocation>
<relocation>
<pattern>net.jpountz</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.net.jpountz</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.net.jpountz</shadedPattern>
</relocation>
<relocation>
<pattern>com.yahoo</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.com.yahoo</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.com.yahoo</shadedPattern>
</relocation>
<relocation>
<pattern>com.typesafe</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.com.typesafe</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.com.typesafe</shadedPattern>
</relocation>
<relocation>
<pattern>org.glassfish</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.org.glassfish</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.org.glassfish</shadedPattern>
</relocation>
<relocation>
<pattern>javax.ws</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.javax.ws</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.javax.ws</shadedPattern>
</relocation>
<relocation>
<pattern>javax.annotation</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.javax.annotation</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.javax.annotation</shadedPattern>
</relocation>
<relocation>
<pattern>jersey</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.jersey</shadedPattern>
+ <shadedPattern>org.apache.pulsar.shade.jersey</shadedPattern>
</relocation>
<relocation>
<pattern>org.jvnet</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.org.jvnet</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.org.jvnet</shadedPattern>
</relocation>
<relocation>
<pattern>org.aopalliance</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.org.aopalliance</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.org.aopalliance</shadedPattern>
</relocation>
<relocation>
<pattern>javassist</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.javassist</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.javassist</shadedPattern>
</relocation>
<relocation>
<pattern>javax.inject</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.javax.inject</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.javax.inject</shadedPattern>
</relocation>
<relocation>
<pattern>org.reactivestreams</pattern>
-
<shadedPattern>org.apache.pulsar.admin.shade.org.reactivestreams</shadedPattern>
+
<shadedPattern>org.apache.pulsar.shade.org.reactivestreams</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.avro</pattern>
diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
index f88f90c..bc2d565 100644
--- a/pulsar-client-shaded/pom.xml
+++ b/pulsar-client-shaded/pom.xml
@@ -147,10 +147,6 @@
<shadedPattern>org.apache.pulsar.shade.io.netty</shadedPattern>
</relocation>
<relocation>
- <pattern>org.apache.pulsar.common</pattern>
-
<shadedPattern>org.apache.pulsar.shade.org.apache.pulsar.common</shadedPattern>
- </relocation>
- <relocation>
<pattern>org.apache.pulsar.policies</pattern>
<shadedPattern>org.apache.pulsar.shade.org.apache.pulsar.policies</shadedPattern>
</relocation>
diff --git a/tests/integration/s3-offload/pom.xml
b/tests/integration/s3-offload/pom.xml
index 2d4812a..ad2d5eb 100644
--- a/tests/integration/s3-offload/pom.xml
+++ b/tests/integration/s3-offload/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client</artifactId>
+ <artifactId>pulsar-client-original</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
