Author: oching
Date: Mon Jan 19 21:32:11 2009
New Revision: 735937
URL: http://svn.apache.org/viewvc?rev=735937&view=rev
Log:
[MRM-1068]
submitted by Maria Catherine Tan
- upgrade redback to 1.2-beta-2
- needed to upgrade spring to 2.5.6 to be compatible with redback 1.2-beta-2
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/SecurityStartupTest.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/resources/org/apache/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.xml
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml?rev=735937&r1=735936&r2=735937&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml
Mon Jan 19 21:32:11 2009
@@ -97,11 +97,6 @@
<role-hint>default</role-hint>
<field-name>evaluator</field-name>
</requirement>
- <requirement>
-
<role>org.codehaus.plexus.redback.configuration.UserConfiguration</role>
- <role-hint>default</role-hint>
- <field-name>config</field-name>
- </requirement>
</requirements>
</component>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml?rev=735937&r1=735936&r2=735937&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml
Mon Jan 19 21:32:11 2009
@@ -83,11 +83,6 @@
<role-hint>default</role-hint>
<field-name>evaluator</field-name>
</requirement>
- <requirement>
-
<role>org.codehaus.plexus.redback.configuration.UserConfiguration</role>
- <role-hint>default</role-hint>
- <field-name>config</field-name>
- </requirement>
</requirements>
</component>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/SecurityStartupTest.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/SecurityStartupTest.xml?rev=735937&r1=735936&r2=735937&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/SecurityStartupTest.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/SecurityStartupTest.xml
Mon Jan 19 21:32:11 2009
@@ -120,10 +120,6 @@
<role-hint>memory</role-hint>
<field-name>rbacManager</field-name>
</requirement>
- <requirement>
- <role>org.codehaus.plexus.PlexusContainer</role>
- <field-name>container</field-name>
- </requirement>
</requirements>
</component>
@@ -180,11 +176,6 @@
<role-hint>default</role-hint>
<field-name>evaluator</field-name>
</requirement>
- <requirement>
-
<role>org.codehaus.plexus.redback.configuration.UserConfiguration</role>
- <role-hint>default</role-hint>
- <field-name>config</field-name>
- </requirement>
</requirements>
</component>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=735937&r1=735936&r2=735937&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon Jan 19
21:32:11 2009
@@ -332,6 +332,32 @@
</execution>
</executions>
</plugin>
+ <!--
+ here's a hack to prevent multiple struts core and same struts.xml in
classpath
+ which prevent struts start
+ -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>cleanup-struts-jar-in-webapp</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete includeemptydirs="true">
+ <fileset dir="${basedir}/src/main/webapp/WEB-INF/lib"
includes="**/struts2*.jar" />
+ </delete>
+ <delete includeemptydirs="true">
+ <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes"
includes="**/struts.*" />
+ </delete>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/resources/org/apache/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/resources/org/apache/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.xml?rev=735937&r1=735936&r2=735937&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/resources/org/apache/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/resources/org/apache/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.xml
Mon Jan 19 21:32:11 2009
@@ -85,11 +85,6 @@
<role-hint>default</role-hint>
<field-name>evaluator</field-name>
</requirement>
- <requirement>
-
<role>org.codehaus.plexus.redback.configuration.UserConfiguration</role>
- <role-hint>default</role-hint>
- <field-name>config</field-name>
- </requirement>
</requirements>
</component>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=735937&r1=735936&r2=735937&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Mon Jan 19 21:32:11 2009
@@ -952,7 +952,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.5.5</version>
+ <version>${spring.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -963,7 +963,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.5.5</version>
+ <version>${spring.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -974,7 +974,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.5.5</version>
+ <version>${spring.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -1043,9 +1043,10 @@
<properties>
<maven.version>2.0.8</maven.version>
<wagon.version>1.0-beta-4</wagon.version>
- <redback.version>1.2-beta-1</redback.version>
+ <redback.version>1.2-beta-2</redback.version>
<jetty.version>6.1.6</jetty.version>
<binder.version>0.9</binder.version>
+ <spring.version>2.5.6</spring.version>
</properties>
<profiles>
<profile>
