fix maven 2.2.1 build

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index bd0cd8aa99fec159f0282878ca0a143fec158f95..c4a985fb5da1537d93af9ea283f616186903002b 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -66,6 +66,16 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-xml-tools</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-security</artifactId>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
index aec68def1ff200e3bcf5a5b3ef7eef6dcfdbb0d7..64ae7f8ad5a26e55b91970dc24d9c4e729516f71 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
@@ -210,7 +210,6 @@ public class EditOrganizationInfoActionTest
     @Override
     protected AbstractAppearanceAction getAction()
     {
-        //return (EditOrganisationInfoAction) lookup( Action.class.getName(), "editOrganisationInfo" );
         return (EditOrganisationInfoAction) getActionProxy( "/admin/editAppearance.action" ).getAction();
     }
 }

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java
index 9696868aaf68a69b19112b3b57c1d58b22d539b6..470544f0b8723d43bb22dc49a3f83f611104c42f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java
@@ -52,8 +52,9 @@ public class ValidatorUtil
                     // check the contents of error messages per field error
                     for ( int i = 0; i < expectedEntry.getValue().size(); i++ )
                     {
-                        Assert.assertEquals( expectedEntry.getValue().get( i ),
-                                             actualFieldErrors.get( expectedEntry.getKey() ).get( i ) );
+                        String expected = expectedEntry.getValue().get( i );
+                        String actual = actualFieldErrors.get( expectedEntry.getKey() ).get( i );
+                        Assert.assertEquals( expected, actual );
                     }
                 }
                 else