[incubator-pulsar] branch branch-1.22 updated: Relocate service files for shading `pulsar-client-admin` module

[jai1]

This is an automated email from the ASF dual-hosted git repository.

jai1 pushed a commit to branch branch-1.22
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/branch-1.22 by this push:
     new 4c946b6  Relocate service files for shading `pulsar-client-admin` 
module
4c946b6 is described below

commit 4c946b6d70172347d07057f8cb5a2b33ca327d3c
Author: Jai Asher <j...@ccs.neu.edu>
AuthorDate: Wed May 2 01:28:21 2018 -0700

    Relocate service files for shading `pulsar-client-admin` module
---
 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 b4e63d7..daa6c5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -805,7 +805,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 c5624fe..f72243f 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 81f873e..9219c1f 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
j...@apache.org.