diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2009-07-30 06:15:04 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2009-07-30 06:15:04 +0000 |
| commit | 06ac3284ec3f86a9cd160c5bc7e2a80c80f2c51c (patch) | |
| tree | 985ffd69577d98441c71daaf2499452d5cec0c4f /archiva-cli | |
| parent | f62c635bdeea0d83c2d5386c787914958d12ae1e (diff) | |
| download | archiva-06ac3284ec3f86a9cd160c5bc7e2a80c80f2c51c.tar.gz archiva-06ac3284ec3f86a9cd160c5bc7e2a80c80f2c51c.zip | |
[MRM-1141] archiva-cli no longer works
o merge content of all spring-context.xml files
o include commons-io in shaded jar, this is needed for repository scan
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@799177 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-cli')
| -rw-r--r-- | archiva-cli/pom.xml | 4 | ||||
| -rw-r--r-- | archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 95ac68b44..10d617ead 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -87,6 +87,9 @@ <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.XmlAppendingTransformer"> + <resource>META-INF/spring-context.xml</resource> </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" /> </transformers> @@ -96,7 +99,6 @@ <exclude>xml-apis:xml-apis</exclude> <exclude>xalan:xalan</exclude> <exclude>commons-beanutils:commons-beanutils</exclude> - <exclude>commons-io:commons-io</exclude> </excludes> </artifactSet> </configuration> diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java index 5e023f08d..43cb75350 100644 --- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java +++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java @@ -286,7 +286,7 @@ public class ArchivaCli value = "convert", alias = "c") private boolean convert; - @Argument(description = "The properties file for the converstion", value = "properties") + @Argument(description = "The properties file for the conversion", value = "properties") private String properties = "conversion.properties"; @Argument(description = "The repository to scan", value = "repository") |