Merged /archiva/trunk:r825850-882054

author Brett Porter <brett@apache.org>

Thu, 19 Nov 2009 06:20:43 +0000 (06:20 +0000)

committer Brett Porter <brett@apache.org>

Thu, 19 Nov 2009 06:20:43 +0000 (06:20 +0000)
author Brett Porter <brett@apache.org>
Thu, 19 Nov 2009 06:20:43 +0000 (06:20 +0000)
committer Brett Porter <brett@apache.org>
Thu, 19 Nov 2009 06:20:43 +0000 (06:20 +0000)
diff --cc archiva-modules/archiva-base/archiva-repository-layer/pom.xml
Simple merge
diff --cc archiva-modules/archiva-web/archiva-webapp-test/pom.xml
Simple merge
diff --cc archiva-modules/archiva-web/archiva-webapp/pom.xml
Simple merge
author	Brett Porter <brett@apache.org>
	Thu, 19 Nov 2009 06:20:43 +0000 (06:20 +0000)
committer	Brett Porter <brett@apache.org>
	Thu, 19 Nov 2009 06:20:43 +0000 (06:20 +0000)
		1	2
archiva-modules/archiva-base/archiva-repository-layer/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
archiva-modules/archiva-web/archiva-webapp-test/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
archiva-modules/archiva-web/archiva-webapp/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history