diff options
6 files changed, 31 insertions, 28 deletions
diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml index adfb9b2b4..81cbaa5ea 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml +++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml index 8d43cac8d..740b5df8a 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml +++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/SecurityStartupTest.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/SecurityStartupTest.xml index 0ff02e859..258185a19 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/SecurityStartupTest.xml +++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/org/apache/maven/archiva/security/SecurityStartupTest.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index f353e46b0..587810faf 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/resources/org/apache/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/resources/org/apache/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.xml index 9c7b9344f..d6e0d2a1f 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/resources/org/apache/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/test/resources/org/apache/archiva/xmlrpc/security/XmlRpcAuthenticatorTest.xml @@ -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> @@ -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> |