[MRM-1141] archiva-cli no longer works

o merge spring.handlers of spring-context and plexus-spring

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@798809 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 78721811ce4934ea713aa0b1a7ef113826035dc5..95ac68b44be7ec335499c3ccbbecb55ccbdcbbdc 100644 (file)
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -75,7 +75,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>1.0.1</version>
+        <version>1.2.1</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -85,6 +85,9 @@
             <configuration>
               <finalName>apache-archiva-cli-${project.version}</finalName>
               <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                  <resource>META-INF/spring.handlers</resource>
+                </transformer>                
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
               </transformers>
               <artifactSet>