You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by si...@apache.org on 2019/04/13 19:57:36 UTC
[pulsar] branch master updated: shading everything in jcloud (#4037)
This is an automated email from the ASF dual-hosted git repository.
sijie 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 3d8c2ef shading everything in jcloud (#4037)
3d8c2ef is described below
commit 3d8c2ef2780382f77956fd5f84346819b6f9baf3
Author: Boyang Jerry Peng <je...@gmail.com>
AuthorDate: Sat Apr 13 12:57:31 2019 -0700
shading everything in jcloud (#4037)
### Motivation
Shade all transitive dependencies in module jcloud-shaded. This is needed to get offloaders working nicely with presto and pulsar in the pulsar presto plugin. I will have a subsequent PR for that.
Not sure why we don't shade all transitive dependencies for jcloud anyways like we do for other modules.
---
jclouds-shaded/pom.xml | 38 +++++++++++++++++++++++++++++++++++++-
tiered-storage/pom.xml | 3 +--
2 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/jclouds-shaded/pom.xml b/jclouds-shaded/pom.xml
index 6b308c0..8e0fa7c 100644
--- a/jclouds-shaded/pom.xml
+++ b/jclouds-shaded/pom.xml
@@ -72,14 +72,50 @@
<include>com.google.inject.extensions:guice-assistedinject</include>
<include>com.google.inject:guice</include>
<include>com.google.inject.extensions:guice-multibindings</include>
+ <include>javax.ws.rs:*</include>
+ <include>com.jamesmurty.utils:*</include>
+ <include>net.iharder:*</include>
+ <include>aopalliance:*</include>
+ <include>javax.inject:*</include>
+ <include>javax.annotation:*</include>
+ <inlude>com.google.errorprone:*</inlude>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>com.google</pattern>
- <shadedPattern>org.apache.pulsar.shaded.com.google</shadedPattern>
+ <shadedPattern>org.apache.pulsar.jcloud.shade.com.google</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>javax.ws</pattern>
+ <shadedPattern>org.apache.pulsar.jcloud.shade.javax.ws</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.jamesmurty.utils</pattern>
+ <shadedPattern>org.apache.pulsar.jcloud.shade.com.jamesmurty.utils</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>aopalliance</pattern>
+ <shadedPattern>org.apache.pulsar.jcloud.shade.aopalliance</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>net.iharder</pattern>
+ <shadedPattern>org.apache.pulsar.jcloud.shade.net.iharder</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax.inject</pattern>
+ <shadedPattern>org.apache.pulsar.jcloud.shade.javax.inject</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax.annotation</pattern>
+ <shadedPattern>org.apache.pulsar.jcloud.shade.javax.annotation</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.errorprone</pattern>
+ <shadedPattern>org.apache.pulsar.jcloud.shade.com.google.errorprone</shadedPattern>
+ </relocation>
+
</relocations>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
diff --git a/tiered-storage/pom.xml b/tiered-storage/pom.xml
index 5b67aa8..6d0327b 100644
--- a/tiered-storage/pom.xml
+++ b/tiered-storage/pom.xml
@@ -33,8 +33,7 @@
<name>Apache Pulsar :: Tiered Storage :: Parent</name>
<properties>
- <!-- pin the jclouds-shaded version to make the pulsar build friendly to intellij -->
- <pulsar.jclouds.shaded.version>2.3.0</pulsar.jclouds.shaded.version>
+ <pulsar.jclouds.shaded.version>${project.version}</pulsar.jclouds.shaded.version>
</properties>
<modules>