refs/heads/metadata-rejig-1.2 - archiva

commit	c3f87db862d6f05fa37d94191908b216857708ad	[log] [tgz]
author	James William Dumay <jdumay@apache.org>	Wed Aug 13 01:47:08 2008 +0000
committer	James William Dumay <jdumay@apache.org>	Wed Aug 13 01:47:08 2008 +0000
tree	b45d3e12f746d705b640e55acf60b849575cf9db
parent	08ab14db02d7975fda4992583dca7bf62d9b2916 [diff]

Fix failing test testGetMergedMetadata(org.apache.maven.archiva.webdav.RepositoryServletRepositoryGroupTest)


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/metadata-rejig-1.2@685414 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java[diff]
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataMerge.java[diff]
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java[diff]

3 files changed

tree: b45d3e12f746d705b640e55acf60b849575cf9db

archiva-cli/
archiva-docs/
archiva-jetty/
archiva-modules/
src/
LICENSE
pom-4.1.0.xml
pom.xml