You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2018/03/13 01:41:27 UTC
[incubator-pulsar] branch master updated: Relocate service files
for shading `pulsar-client-admin` module (#1370)
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/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 662ac9b Relocate service files for shading `pulsar-client-admin` module (#1370)
662ac9b is described below
commit 662ac9b8f4e9b0ea46cee3ddd96cc95fa691ca63
Author: Sijie Guo <gu...@gmail.com>
AuthorDate: Mon Mar 12 18:41:24 2018 -0700
Relocate service files for shading `pulsar-client-admin` module (#1370)
* Relocate service files for shading `pulsar-client-admin` module
* Relocate service in `pulsar-client-shaded` as well
---
pom.xml | 2 +-
pulsar-client-admin-shaded/pom.xml | 4 ++++
pulsar-client-shaded/pom.xml | 4 ++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7137195..2472cc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -979,7 +979,7 @@ flexible messaging model and an intuitive client API.</description>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.2</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml
index 7239947..a908ef9 100644
--- a/pulsar-client-admin-shaded/pom.xml
+++ b/pulsar-client-admin-shaded/pom.xml
@@ -185,6 +185,10 @@
<shadedPattern>org.apache.pulsar.admin.shade.org.reactivestreams</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer" />
+ </transformers>
</configuration>
</execution>
</executions>
diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
index 777ce63..c67c546 100644
--- a/pulsar-client-shaded/pom.xml
+++ b/pulsar-client-shaded/pom.xml
@@ -160,6 +160,10 @@
<shadedPattern>org.apache.pulsar.shade.org.apache.http</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer" />
+ </transformers>
</configuration>
</execution>
</executions>
--
To stop receiving notification emails like this one, please contact
mmerli@apache.org.