Author: oching
Date: Thu Jul 30 06:15:04 2009
New Revision: 799177
URL: http://svn.apache.org/viewvc?rev=799177&view=rev
Log:
[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
Modified:
archiva/trunk/archiva-cli/pom.xml
archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
Modified: archiva/trunk/archiva-cli/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-cli/pom.xml?rev=799177&r1=799176&r2=799177&view=diff
==============================================================================
--- archiva/trunk/archiva-cli/pom.xml (original)
+++ archiva/trunk/archiva-cli/pom.xml Thu Jul 30 06:15:04 2009
@@ -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>
Modified:
archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java?rev=799177&r1=799176&r2=799177&view=diff
==============================================================================
---
archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
(original)
+++
archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
Thu Jul 30 06:15:04 2009
@@ -286,7 +286,7 @@
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")
