diff options
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") |