source.dussan.org Git - archiva.git/commit

]> source.dussan.org Git - archiva.git/commit

author	Brett Porter <brett@apache.org>
	Wed, 30 Jul 2014 04:34:42 +0000 (14:34 +1000)
committer	Brett Porter <brett@apache.org>
	Wed, 30 Jul 2014 04:34:42 +0000 (14:34 +1000)
commit	54f97d54cb262f628041b042adb31cc2add21533
tree	ba1b5e0df3fa1ed7850529ac7687f741e91ab99d	tree \| snapshot
parent	c329113c529d8cd87cba757d41ae60ba3c4302a2	commit \| diff

fix merge of converters

The test files in artifact converter had been adjusted, and need to merge the
spring context. Also make the artifactConverter injection more specific to
avoid picking up those defined for tests

archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java		diff \| blob \| history
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom		diff \| blob \| history
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom		diff \| blob \| history
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3-warnings.pom		diff \| blob \| history
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3.pom		diff \| blob \| history
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom		diff \| blob \| history
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom		diff \| blob \| history
archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml		diff \| blob \| history

Apache Archiva Repository: https://github.com/apache/archiva

RSS Atom