o Update plexus-utils to 1.3 so we can run the plexus-runtime correctly under windows

o Update plexus application/runtime conf so it's the same we have in continuum

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@466951 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-plexus-application/pom.xml b/archiva-plexus-application/pom.xml
index 13e1546cb969519d4f4645a2c9d003c0a5be4959..6eb24f1cca32a59a41cd88623e14280103033ea4 100644 (file)
--- a/archiva-plexus-application/pom.xml
+++ b/archiva-plexus-application/pom.xml
@@ -20,6 +20,9 @@
           <configurationsDirectory>src/conf</configurationsDirectory>
           <configurationProperties>src/plexus.properties</configurationProperties>
           <applicationName>archiva</applicationName>
+          <runtimeConfiguration>src/conf/plexus.xml</runtimeConfiguration>
+          <runtimeConfigurationProperties>src/plexus.properties</runtimeConfigurationProperties>
+          <runtimePath>target/plexus-archiva-runtime</runtimePath>
         </configuration>
       </plugin>
     </plugins>

diff --git a/archiva-plexus-application/src/conf/plexus.xml b/archiva-plexus-application/src/conf/plexus.xml
new file mode 100644 (file)
index 0000000..f997fa7
--- /dev/null
+++ b/archiva-plexus-application/src/conf/plexus.xml
@@ -0,0 +1 @@
+<plexus/>

diff --git a/archiva-plexus-runtime/pom.xml b/archiva-plexus-runtime/pom.xml
index 7beba9e6a4cdabdd283516cd526704966eebd6d5..2c204db3464b581b24abd7470a8974cec530a94f 100644 (file)
--- a/archiva-plexus-runtime/pom.xml
+++ b/archiva-plexus-runtime/pom.xml
@@ -83,6 +83,7 @@
           <runtimePath>target/plexus-archiva-runtime</runtimePath>
           <additionalCoreArtifacts>
             <additionalCoreArtifact>commons-logging:commons-logging-api</additionalCoreArtifact>
+            <additionalCoreArtifact>log4j:log4j</additionalCoreArtifact>
             <additionalCoreArtifact>org.apache.derby:derby</additionalCoreArtifact>
             <additionalCoreArtifact>org.codehaus.plexus:plexus-naming</additionalCoreArtifact>
             <additionalCoreArtifact>commons-pool:commons-pool</additionalCoreArtifact>

diff --git a/archiva-plexus-runtime/src/plexus.properties b/archiva-plexus-runtime/src/plexus.properties
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0efd1c125fa7df66161e6536ec18bbd6c7e0c8f6 100644 (file)
--- a/archiva-plexus-runtime/src/plexus.properties
+++ b/archiva-plexus-runtime/src/plexus.properties
@@ -0,0 +1,3 @@
+app.name = archiva
+app.long.name = Archiva
+app.description = Archiva - the Maven Repository Manager

diff --git a/pom.xml b/pom.xml
index 898bba813b20249c3223bf21807355930ab80c30..c6963f59dcf42e35d6bc6b0f5dd42c01dd29badb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>1.1</version>
+        <version>1.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>