summaryrefslogtreecommitdiffstats
path: root/archiva-cli
diff options
context:
space:
mode:
Diffstat (limited to 'archiva-cli')
-rw-r--r--archiva-cli/pom.xml36
-rw-r--r--archiva-cli/src/main/resources/META-INF/spring-context.xml8
2 files changed, 19 insertions, 25 deletions
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index dd603b8ae..f47154902 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>
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>