ensure archiva-cli is able to run

clean up the dependencies used and add some missing configuration form shade


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/732531eb
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/732531eb
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/732531eb

Branch: refs/heads/master
Commit: 732531ebef675b45f964447cf44f310d67298f2d
Parents: 0f2467e
Author: Brett Porter <[email protected]>
Authored: Wed Jul 30 12:03:33 2014 +1000
Committer: Brett Porter <[email protected]>
Committed: Wed Jul 30 12:05:02 2014 +1000

----------------------------------------------------------------------
 archiva-cli/pom.xml                             | 36 +++++++-------------
 .../main/resources/META-INF/spring-context.xml  |  8 +++--
 .../archiva-base/archiva-proxy-common/pom.xml   |  6 ++--
 3 files changed, 23 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/732531eb/archiva-cli/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index dd603b8..f471549 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -34,16 +34,15 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-metadata-consumer</artifactId>
-      <scope>runtime</scope>
+      <artifactId>archiva-repository-admin-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-configuration</artifactId>
+      <artifactId>archiva-consumer-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-consumer-api</artifactId>
+      <artifactId>archiva-plexus-bridge</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
@@ -60,47 +59,38 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-file</artifactId>
-    </dependency>
-    <dependency>
       <groupId>com.google.code.cli-parser</groupId>
       <artifactId>cli</artifactId>
       <version>7</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
+      <artifactId>spring-context</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-jcl</artifactId>
-      <scope>compile</scope>
+      <artifactId>log4j-slf4j-impl</artifactId>
     </dependency>
+    <!-- Consumers to include -->
+    <!--
+    This will require some additional configuration now to point to an 
appropriate metadata repository storage, which is not in the CLI yet
     <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-1.2-api</artifactId>
-      <scope>compile</scope>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-metadata-consumer</artifactId>
+      <scope>runtime</scope>
     </dependency>
+    -->
   </dependencies>
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>1.2.2</version>
+        <version>2.3</version>
         <executions>
           <execution>
             <phase>package</phase>

http://git-wip-us.apache.org/repos/asf/archiva/blob/732531eb/archiva-cli/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
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 0289878..b40e385 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>

http://git-wip-us.apache.org/repos/asf/archiva/blob/732531eb/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml 
b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
index 002fa8d..9ac0682 100644
--- a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
@@ -45,15 +45,17 @@
       <artifactId>wagon-file</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- currently these are runtime as it's declared in the spring context
+         file, but is it necessary? -->
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-http-lightweight</artifactId>
-      <scope>test</scope>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-http</artifactId>
-      <scope>test</scope>
+      <scope>runtime</scope>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>

Reply via email to