From 732531ebef675b45f964447cf44f310d67298f2d Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Wed, 30 Jul 2014 12:03:33 +1000
Subject: ensure archiva-cli is able to run

clean up the dependencies used and add some missing configuration form shade
---
 archiva-cli/src/main/resources/META-INF/spring-context.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'archiva-cli/src/main')

diff --git a/archiva-cli/src/main/resources/META-INF/spring-context.xml b/archiva-cli/src/main/resources/META-INF/spring-context.xml
index 028987855..b40e3851a 100644
--- a/archiva-cli/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-cli/src/main/resources/META-INF/spring-context.xml
@@ -21,13 +21,17 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
            http://www.springframework.org/schema/context 
-           http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+           http://www.springframework.org/schema/context/spring-context-3.0.xsd
+           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
        default-lazy-init="true">
 
+  <!-- Note: must include util namespace above to accommodate MSHADE-175 -->
+
   <context:annotation-config/>
   <context:component-scan base-package="org.apache.archiva.cli"/>
 
-</beans>
\ No newline at end of file
+</beans>
-- 
cgit v1.2.3