Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
Maria Odea B. Ching 2009-07-30 06:15:04 +00:00
parent f62c635bde
commit 06ac3284ec
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-cli/pom.xml
View File

@ -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>

2
archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
View File

@ -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")