diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-09-29 10:28:13 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-09-29 10:28:13 +0000 |
| commit | 5daf80bc20b5bf59ba3a635f332a542411bb9c40 (patch) | |
| tree | 1b0e93603269d9780f93d2756ab03e862de82bf9 | |
| parent | 752fe5c0d1d82a686b901c704954b4a02983b90c (diff) | |
| download | archiva-5daf80bc20b5bf59ba3a635f332a542411bb9c40.tar.gz archiva-5daf80bc20b5bf59ba3a635f332a542411bb9c40.zip | |
fix maven 2.2.1 build
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177255 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 13 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index bd0cd8aa9..c4a985fb5 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -68,6 +68,16 @@ </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> </dependency> <dependency> 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 aec68def1..64ae7f8ad 100644 --- 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 9696868aa..470544f0b 100644 --- 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 |