You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/09/08 19:05:06 UTC
[archiva] branch feature/storage_refactoring updated (32c4ada ->
363c4c9)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch feature/storage_refactoring
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from 32c4ada Using test loop for browse service test
add 5c413a7 Adding maven path into Jenkins mvn call
add 9ea6ed4 Changing build to maven 3.5.4
add 51171b9 Reducing time resolution for meta artifacts
add 9bb3c0d Relaxing precision for date comparison in unit test
add 3d2006a Improving error handling and log for repository scan
add f1ae6b4 Moving mavenmerge class to archiva-maven-repository module
add 36249f6 Trying to fix merge test error on build server
add f39fc91 Fixes for JDK11
add c5b308a Removing unused dependencies in pom.xml
add b8fe782 Adding utility class to get rid of ant dependency
add 697bef3 Updating maven dependencies
add 9a2f183 Optimized import
add ef60ef8 Cleaning up dependencies
add d07420a Fixing bad import
add d7c3dbe Removing maven-artifact-manager dependency
add 316c190 Replacing jsr250 dependency by javax.annotations
add 8dd880c Fixing enunciate configuration
add 0df75b7 Removing duplicate dependencies
add 41af9ab Removing unused dependency
add 02d160e Removing unused archetype-common dependency
add e2cb026 Fixing archiva-converter dependency
add 91e228f Adding class from maven-compat module
add 2617c86 Cleanup of maven dependency (maven-compat)
add 69c8dd6 Exclude aopalliance dependency
add 4becc44 Excluding guice dependency from maven-indexer
add 3bf8e76 Switching commons collections version
add d331032 Updating apache commons library versions
add 316874d Removing sonatype aether dependency
add 9bae616 Changing version of wagon and maven-converter
add c7fb08d Removing felix dependency
add ebf9572 Modifying NetworkProxy class. Adding tests.
add 926dc79 Refactoring proxy classes
add bc6065c Update of policies. Adding descriptions and using locale.
add 363c4c9 Switching to enum for policy options
No new revisions were added by this update.
Summary of changes:
Jenkinsfile | 2 +-
Jenkinsfile-itest | 2 +-
archiva-cli/pom.xml | 22 +-
.../java/org/apache/archiva/cli/ArchivaCli.java | 3 +-
.../archiva-base/archiva-checksum/pom.xml | 39 +-
.../archiva/checksum/ChecksummedFileTest.java | 2 +-
.../archiva-base/archiva-common/pom.xml | 13 +-
.../org/apache/archiva/common/utils/PathUtil.java | 2 +-
.../archiva/common/utils/VersionComparator.java | 6 +-
.../apache/archiva/common/utils/VersionUtil.java | 2 +-
.../apache/archiva/common/utils/BaseFileTest.java | 2 +-
.../apache/archiva/common/utils/PathUtilTest.java | 2 +-
.../apache/archiva/common/utils/ResourceUtils.java | 2 +-
.../archiva-base/archiva-configuration/pom.xml | 56 ++-
.../configuration/DefaultArchivaConfiguration.java | 14 +-
.../apache/archiva/configuration/FileTypes.java | 6 +-
.../configuration/MavenProxyPropertyLoader.java | 6 +-
.../functors/FiletypeSelectionPredicate.java | 2 +-
.../functors/NetworkProxySelectionPredicate.java | 2 +-
.../functors/ProxyConnectorSelectionPredicate.java | 2 +-
.../archiva/configuration/util/PathMatcher.java | 410 +++++++++++++++++++++
.../ArchivaConfigurationMRM789Test.java | 2 +-
.../configuration/ArchivaConfigurationTest.java | 2 +-
...yConnectorConfigurationOrderComparatorTest.java | 2 +-
.../functors/ConsumerWantsFilePredicate.java | 2 +-
.../META-INF/maven/archetype-metadata.xml | 3 +
.../resourcesstatic/archetype-resources/pom.xml | 13 +-
.../projects/compile/archetype.properties | 1 +
.../core/repository/AbstractRepositoryPurge.java | 2 +-
.../core/repository/DaysOldRepositoryPurge.java | 16 +-
.../core/AbstractArtifactConsumerTest.java | 2 +-
.../repository/AbstractRepositoryPurgeTest.java | 2 +-
.../repository/DaysOldRepositoryPurgeTest.java | 10 +-
.../archiva-lucene-consumers/pom.xml | 15 +
.../archiva-base/archiva-filelock/pom.xml | 5 +-
.../common/filelock/DefaultFileLockManager.java | 2 +-
archiva-modules/archiva-base/archiva-mock/pom.xml | 4 +-
archiva-modules/archiva-base/archiva-model/pom.xml | 11 +-
.../org/apache/archiva/model/ArchivaArtifact.java | 2 +-
.../main/java/org/apache/archiva/model/Keys.java | 2 +-
.../archiva-base/archiva-plexus-bridge/pom.xml | 41 +--
.../archiva-base/archiva-policies/pom.xml | 60 ++-
.../apache/archiva/policies/AbstractPolicy.java | 98 +++++
.../archiva/policies/AbstractUpdatePolicy.java | 26 +-
.../archiva/policies/CachedFailuresPolicy.java | 25 +-
...igurationException.java => ChecksumOption.java} | 41 ++-
.../apache/archiva/policies/ChecksumPolicy.java | 29 +-
...eleasesPolicy.java => DownloadErrorOption.java} | 54 ++-
.../archiva/policies/DownloadErrorPolicy.java | 4 +-
.../apache/archiva/policies/DownloadPolicy.java | 2 +-
.../java/org/apache/archiva/policies/Policy.java | 48 ++-
.../{PostDownloadPolicy.java => PolicyOption.java} | 16 +-
.../{PostDownloadPolicy.java => PolicyUtil.java} | 15 +-
.../policies/PropagateErrorsDownloadPolicy.java | 28 +-
.../PropagateErrorsOnUpdateDownloadPolicy.java | 25 +-
.../apache/archiva/policies/ReleasesPolicy.java | 11 +-
.../apache/archiva/policies/SnapshotsPolicy.java | 12 +-
...igurationException.java => StandardOption.java} | 42 ++-
.../{ReleasesPolicy.java => UpdateOption.java} | 53 +--
.../src/main/resources/archiva_policies.properties | 74 ++++
.../main/resources/archiva_policies_de.properties} | 4 +-
.../main/resources/archiva_policies_en.properties} | 4 +-
.../main/resources/archiva_policies_fr.properties} | 4 +-
.../archiva/policies/CachedFailuresPolicyTest.java | 29 +-
.../archiva/policies/ChecksumPolicyTest.java | 30 +-
...java => PropagateErrorsDownloadPolicyTest.java} | 76 ++--
...PropagateErrorsOnUpdateDownloadPolicyTest.java} | 69 ++--
.../apache/archiva/policies/ReleasePolicyTest.java | 36 +-
.../archiva/policies/SnapshotsPolicyTest.java | 33 +-
.../archiva-base/archiva-proxy-api/pom.xml | 14 +-
.../org/apache/archiva/proxy/ProxyRegistry.java | 6 +
.../apache/archiva/proxy/model/NetworkProxy.java | 24 +-
.../apache/archiva/proxy/model/ProxyConnector.java | 18 +-
.../archiva/proxy/model/NetworkProxyTest.java | 174 +++++++++
archiva-modules/archiva-base/archiva-proxy/pom.xml | 8 +-
.../apache/archiva/proxy/ArchivaProxyRegistry.java | 18 +-
.../proxy/DefaultRepositoryProxyHandler.java | 86 ++---
.../archiva-repository-admin-api/pom.xml | 4 +-
.../admin/model/beans/RemoteRepository.java | 2 +-
.../ProxyConnectorSelectionPredicate.java | 2 +-
.../archiva-repository-admin-default/pom.xml | 14 +-
.../admin/repository/AbstractRepositoryAdmin.java | 2 +-
.../DefaultRepositoryCommonValidator.java | 2 +-
.../admin/DefaultArchivaAdministration.java | 6 +-
.../group/DefaultRepositoryGroupAdmin.java | 2 +-
.../managed/DefaultManagedRepositoryAdmin.java | 2 +-
.../networkproxy/DefaultNetworkProxyAdmin.java | 2 +-
.../proxyconnector/DefaultProxyConnectorAdmin.java | 2 +-
.../DefaultProxyConnectorRuleAdmin.java | 2 +-
.../remote/DefaultRemoteRepositoryAdmin.java | 2 +-
.../DefaultRedbackRuntimeConfigurationAdmin.java | 2 +-
.../admin/mock/ArchivaIndexManagerMock.java | 4 +-
.../repository/AbstractRepositoryAdminTest.java | 2 +-
.../archiva-base/archiva-repository-api/pom.xml | 4 +-
.../apache/archiva/indexer/util/SearchUtil.java | 2 +-
.../repository/connector/RepositoryConnector.java | 11 +-
.../repository/features/IndexCreationFeature.java | 2 +-
.../repository/features/RemoteIndexFeature.java | 2 +-
.../archiva-base/archiva-repository-layer/pom.xml | 11 +-
.../archiva/indexer/merger/DefaultIndexMerger.java | 2 +-
.../DefaultMergedRemoteIndexesScheduler.java | 2 +-
.../archiva/repository/AbstractRepository.java | 2 +-
.../archiva/repository/RepositoryRegistry.java | 2 +-
.../archiva/repository/metadata/MetadataTools.java | 27 +-
.../metadata/RepositoryMetadataMerge.java | 2 +-
.../metadata/RepositoryMetadataWriter.java | 2 +-
.../archiva-repository-scanner/pom.xml | 17 +-
.../scanner/DefaultRepositoryScanner.java | 2 +-
.../scanner/RepositoryScannerInstance.java | 13 +-
.../scanner/RepositoryContentConsumersTest.java | 2 +-
.../scanner/mock/ManagedRepositoryContentMock.java | 2 +-
.../archiva-base/archiva-storage-fs/pom.xml | 8 +
.../repository/storage/FilesystemAsset.java | 2 +-
.../archiva/repository/storage/StorageUtil.java | 2 +-
.../archiva-base/archiva-transaction/pom.xml | 35 +-
.../java/org/apache/archiva/xml/XMLReader.java | 2 +-
.../archiva-maven/archiva-maven-common/pom.xml | 4 +-
.../archiva/proxy/maven/DefaultWagonFactory.java | 2 +-
.../archiva/proxy/maven/WagonFactoryRequest.java | 2 +-
.../archiva-maven/archiva-maven-converter/pom.xml | 54 ++-
.../artifact/LegacyToDefaultConverter.java | 1 -
.../SnapshotArtifactRepositoryMetadata.java | 106 ++++++
.../archiva/converter/RepositoryConverterTest.java | 1 -
.../artifact/LegacyToDefaultConverterTest.java | 1 -
.../archiva-maven/archiva-maven-indexer/pom.xml | 4 +-
.../archiva/indexer/maven/MavenIndexManager.java | 4 +-
.../maven/search/MavenRepositorySearch.java | 2 +-
.../search/NoClassifierArtifactInfoFilter.java | 2 +-
.../apache/archiva/indexer/util/SearchUtil.java | 2 +-
.../search/AbstractMavenRepositorySearch.java | 2 +-
.../archiva-maven/archiva-maven-metadata/pom.xml | 4 +-
.../maven2/metadata/MavenMetadataReader.java | 2 +-
.../metadata/model/maven2/MavenArtifactFacet.java | 2 +-
.../archiva-maven/archiva-maven-proxy/pom.xml | 29 +-
.../proxy/maven/MavenRepositoryProxyHandler.java | 4 +-
.../archiva/proxy/AbstractProxyTestCase.java | 33 +-
.../apache/archiva/proxy/ErrorHandlingTest.java | 12 +-
.../archiva/proxy/HttpProxyTransferTest.java | 16 +-
.../archiva/proxy/ManagedDefaultTransferTest.java | 2 +-
.../apache/archiva/proxy/MetadataTransferTest.java | 2 +-
.../apache/archiva/proxy/MockConfiguration.java | 23 +-
.../mock/ManagedRepositoryContentMock.java | 2 +-
.../src/test/resources/spring-context.xml | 10 +-
.../archiva-maven/archiva-maven-repository/pom.xml | 55 ++-
.../tree/maven2/Maven3DependencyTreeBuilder.java | 2 +-
.../storage/maven2/Maven2RepositoryStorage.java | 4 +-
.../storage/maven2/RepositoryModelResolver.java | 4 +-
.../maven2/AbstractDefaultRepositoryContent.java | 2 +-
.../content/maven2/DefaultPathParser.java | 2 +-
.../maven2/ManagedDefaultRepositoryContent.java | 2 +-
.../content/maven2/MavenRepositoryRequestInfo.java | 2 +-
.../repository/maven2/MavenRepositoryProvider.java | 2 +-
.../merge/Maven2RepositoryMerger.java | 7 +
.../archiva/configuration/MockRepoAdmin.java | 2 +-
.../archiva/configuration/StubConfiguration.java | 2 +-
.../archiva/configuration/TestConfiguration.java | 2 +-
.../AbstractDefaultRepositoryContentTestCase.java | 2 +-
.../storage/maven2/conf/MockConfiguration.java | 2 +-
.../content/maven2/DefaultPathParserTest.java | 2 +-
.../maven2/MavenRepositoryRequestInfoTest.java | 2 +-
.../index/mock/ArchivaIndexManagerMock.java | 4 +-
.../repository/metadata/MetadataToolsTest.java | 10 +-
.../merge/Maven2RepositoryMergerTest.java | 4 +-
.../src/test/resources/spring-context-merge.xml} | 0
.../apache/archiva/archiva/1.2.1/archiva-1.2.1.jar | 0
.../apache/archiva/archiva/1.2.1/archiva-1.2.1.pom | 0
.../archiva/archiva/1.2.1/maven-metadata.xml | 0
.../org/apache/archiva/archiva/maven-metadata.xml | 0
.../com/example/invalid-artifact.txt | 0
.../test-artifact/1.0-SNAPSHOT}/maven-metadata.xml | 0
.../1.0-SNAPSHOT/maven-metadata.xml.md5 | 0
.../1.0-SNAPSHOT/maven-metadata.xml.sha1 | 0
.../test-artifact-1.0-20100308.230825-1.jar.md5 | 0
.../test-artifact-1.0-20100308.230825-1.jar.sha1 | 0
.../test-artifact-1.0-20100308.230825-1.pom | 0
.../test-artifact-1.0-20100308.230825-1.pom.md5 | 0
.../test-artifact-1.0-20100308.230825-1.pom.sha1 | 0
...-artifact-1.0-20100310.014828-2-javadoc.jar.md5 | 0
...artifact-1.0-20100310.014828-2-javadoc.jar.sha1 | 0
...-artifact-1.0-20100310.014828-2-sources.jar.md5 | 0
...artifact-1.0-20100310.014828-2-sources.jar.sha1 | 0
.../test-artifact-1.0-20100310.014828-2.jar.md5 | 0
.../test-artifact-1.0-20100310.014828-2.jar.sha1 | 0
.../test-artifact-1.0-20100310.014828-2.pom | 0
.../test-artifact-1.0-20100310.014828-2.pom.md5 | 0
.../test-artifact-1.0-20100310.014828-2.pom.sha1 | 0
.../example/test/test-artifact}/maven-metadata.xml | 0
.../test/test-artifact/maven-metadata.xml.md5 | 0
.../test/test-artifact/maven-metadata.xml.sha1 | 0
.../org/testng/testng/5.8/testng-5.8-jdk15.jar | Bin
.../testng/testng/5.8/testng-5.8-jdk15.jar.sha1 | 0
.../org/testng/testng/5.8/testng-5.8-jdk15.pom | 0
.../org/testng/testng/5.8/testng-5.8.pom.sha1 | 0
.../maven/DefaultDownloadRemoteIndexScheduler.java | 2 +-
.../indexing/maven/DownloadRemoteIndexTask.java | 4 +-
.../archiva-scheduler-api/pom.xml | 6 +
.../archiva-scheduler-repository/pom.xml | 21 +-
.../ArchivaRepositoryScanningTaskExecutor.java | 2 +-
.../DefaultRepositoryArchivaTaskScheduler.java | 2 +-
.../archiva/mock/ArchivaIndexManagerMock.java | 4 +-
.../archiva/mock/MockManagedRepositoryAdmin.java | 2 +-
.../archiva-rest-api/src/enunciate/enunciate.xml | 16 +-
.../archiva/rest/api/model/PolicyInformation.java | 16 +-
.../archiva-rest/archiva-rest-services/pom.xml | 9 +
.../archiva/rest/services/AbstractRestService.java | 2 +-
.../DefaultArchivaAdministrationService.java | 2 +-
.../rest/services/DefaultBrowseService.java | 2 +-
.../rest/services/DefaultCommonServices.java | 2 +-
.../DefaultManagedRepositoriesService.java | 4 +-
.../services/DefaultMergeRepositoriesService.java | 55 ++-
.../services/DefaultProxyConnectorRuleService.java | 2 +-
.../DefaultRedbackRuntimeConfigurationService.java | 2 +-
.../services/DefaultRemoteRepositoriesService.java | 4 +-
.../services/DefaultReportRepositoriesService.java | 2 +-
.../rest/services/DefaultRepositoriesService.java | 2 +-
.../services/DefaultRepositoryGroupService.java | 2 +-
.../rest/services/DefaultSearchService.java | 2 +-
.../rest/services/AbstractArchivaRestTest.java | 17 +-
.../services/ArchivaAdministrationServiceTest.java | 2 +-
.../archiva/rest/services/BrowseServiceTest.java | 12 +-
.../services/MergeRepositoriesServiceTest.java | 5 +-
archiva-modules/archiva-web/archiva-rss/pom.xml | 5 +
.../NewArtifactsRssFeedProcessorTest.java | 4 +-
.../archiva-web/archiva-security/pom.xml | 6 +
.../security/DefaultUserRepositoriesTest.java | 2 +-
.../archiva-web/archiva-web-common/pom.xml | 12 +
.../archiva-web-common/src/enunciate/enunciate.xml | 25 +-
.../archiva/web/api/DefaultFileUploadService.java | 6 +-
.../archiva/web/api/DefaultRuntimeInfoService.java | 4 +-
.../apache/archiva/web/docs/RestDocsServlet.java | 6 +-
.../org/apache/archiva/web/rss/RssFeedServlet.java | 2 +-
.../archiva/web/runtime/ArchivaRuntimeInfo.java | 2 +-
.../ArchivaLockedAdminEnvironmentCheck.java | 2 +-
.../archiva/web/security/ArchivaRbacManager.java | 2 +-
.../org/apache/archiva/web/startup/Banner.java | 2 +-
.../web/startup/SecuritySynchronization.java | 4 +-
.../org/apache/archiva/RuntimeInfoServiceTest.java | 2 +-
.../remotedownload/AbstractDownloadTest.java | 4 +-
.../remotedownload/DownloadArtifactsTest.java | 2 +-
.../apache/archiva/upload/UploadArtifactsTest.java | 4 +-
.../archiva-web/archiva-webapp-test/pom.xml | 4 +-
.../archiva/web/test/RolesManagementTest.java | 2 +-
archiva-modules/archiva-web/archiva-webapp/pom.xml | 17 -
.../apache/archiva/webdav/ArchivaDavResource.java | 2 +-
.../archiva/webdav/ArchivaDavResourceFactory.java | 4 +-
.../apache/archiva/webdav/util/IndexWriter.java | 2 +-
.../org/apache/archiva/webdav/util/MimeTypes.java | 2 +-
.../archiva/webdav/util/RepositoryPathUtil.java | 4 +-
.../archiva/webdav/util/WebdavMethodUtil.java | 2 +-
...ctRepositoryServletProxiedMetadataTestCase.java | 4 +-
.../AbstractRepositoryServletProxiedTestCase.java | 23 +-
.../webdav/AbstractRepositoryServletTestCase.java | 2 +-
.../webdav/ArchivaDavResourceFactoryTest.java | 2 +-
.../archiva/webdav/ArchivaTemporaryFolderRule.java | 2 +-
.../org/apache/archiva/webdav/DavResourceTest.java | 2 +-
...toryServletProxiedPluginSnapshotPolicyTest.java | 5 +-
.../RepositoryServletProxiedReleasePolicyTest.java | 5 +-
...RepositoryServletProxiedSnapshotPolicyTest.java | 5 +-
...ervletProxiedTimestampedSnapshotPolicyTest.java | 5 +-
.../RepositoryServletRepositoryGroupTest.java | 2 +-
.../webdav/RepositoryServletSecurityTest.java | 2 +-
.../webdav/UnauthenticatedRepositoryServlet.java | 2 +-
.../archiva/metadata/model/ArtifactMetadata.java | 5 +-
.../metadata/metadata-repository-api/pom.xml | 2 +-
.../plugins/metadata-store-cassandra/pom.xml | 10 +-
.../cassandra/CassandraMetadataRepository.java | 2 +-
.../CassandraRepositorySessionFactory.java | 2 +-
.../repository/cassandra/CassandraUtils.java | 2 +-
.../cassandra/DefaultCassandraArchivaManager.java | 2 +-
.../plugins/metadata-store-file/pom.xml | 7 +
.../repository/file/FileMetadataRepository.java | 2 +-
.../file/FileRepositorySessionFactory.java | 2 +-
archiva-modules/plugins/metadata-store-jcr/pom.xml | 98 ++---
.../repository/jcr/JcrMetadataRepository.java | 2 +-
.../jcr/JcrRepositorySessionFactory.java | 4 +-
.../repository/jcr/OakRepositoryFactory.java | 2 +-
archiva-modules/plugins/problem-reports/pom.xml | 33 +-
.../stats/DefaultRepositoryStatisticsManager.java | 2 +-
.../plugins/stage-repository-merge/pom.xml | 30 --
.../stagerepository/merge/RepositoryMerger.java | 3 +
pom.xml | 197 +++++-----
281 files changed, 2355 insertions(+), 1133 deletions(-)
create mode 100644 archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/util/PathMatcher.java
create mode 100644 archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractPolicy.java
copy archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/{PolicyConfigurationException.java => ChecksumOption.java} (57%)
copy archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/{ReleasesPolicy.java => DownloadErrorOption.java} (56%)
copy archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/{PostDownloadPolicy.java => PolicyOption.java} (73%)
copy archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/{PostDownloadPolicy.java => PolicyUtil.java} (72%)
copy archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/{PolicyConfigurationException.java => StandardOption.java} (57%)
copy archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/{ReleasesPolicy.java => UpdateOption.java} (56%)
create mode 100644 archiva-modules/archiva-base/archiva-policies/src/main/resources/archiva_policies.properties
copy archiva-modules/{archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/security_en.properties => archiva-base/archiva-policies/src/main/resources/archiva_policies_de.properties} (93%)
copy archiva-modules/{archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/security_en.properties => archiva-base/archiva-policies/src/main/resources/archiva_policies_en.properties} (93%)
copy archiva-modules/{archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/security_en.properties => archiva-base/archiva-policies/src/main/resources/archiva_policies_fr.properties} (93%)
copy archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/{CachedFailuresPolicyTest.java => PropagateErrorsDownloadPolicyTest.java} (50%)
copy archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/{CachedFailuresPolicyTest.java => PropagateErrorsOnUpdateDownloadPolicyTest.java} (53%)
rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-api}/src/main/java/org/apache/archiva/proxy/ProxyRegistry.java (92%)
create mode 100644 archiva-modules/archiva-base/archiva-proxy-api/src/test/java/org/apache/archiva/proxy/model/NetworkProxyTest.java
create mode 100644 archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/SnapshotArtifactRepositoryMetadata.java
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java (98%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/configuration/StubConfiguration.java (98%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java (98%)
rename archiva-modules/{plugins/stage-repository-merge/src/test/resources/spring-context.xml => archiva-maven/archiva-maven-repository/src/test/resources/spring-context-merge.xml} (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.pom (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/maven-metadata.xml (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/target-repo/org/apache/archiva/archiva/maven-metadata.xml (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/invalid-artifact.txt (100%)
rename archiva-modules/{plugins/stage-repository-merge/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact => archiva-maven/archiva-maven-repository/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT}/maven-metadata.xml (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/maven-metadata.xml.md5 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/maven-metadata.xml.sha1 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100308.230825-1.jar.md5 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100308.230825-1.jar.sha1 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100308.230825-1.pom (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100308.230825-1.pom.md5 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100308.230825-1.pom.sha1 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100310.014828-2-javadoc.jar.md5 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100310.014828-2-javadoc.jar.sha1 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100310.014828-2-sources.jar.md5 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100310.014828-2-sources.jar.sha1 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100310.014828-2.jar.md5 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100310.014828-2.jar.sha1 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100310.014828-2.pom (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100310.014828-2.pom.md5 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100310.014828-2.pom.sha1 (100%)
rename archiva-modules/{plugins/stage-repository-merge/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/1.0-SNAPSHOT => archiva-maven/archiva-maven-repository/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact}/maven-metadata.xml (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/maven-metadata.xml.md5 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/com/example/test/test-artifact/maven-metadata.xml.sha1 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/org/testng/testng/5.8/testng-5.8-jdk15.jar (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/org/testng/testng/5.8/testng-5.8-jdk15.jar.sha1 (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/org/testng/testng/5.8/testng-5.8-jdk15.pom (100%)
rename archiva-modules/{plugins/stage-repository-merge => archiva-maven/archiva-maven-repository}/src/test/resources/test-repository-with-conflict-artifacts/org/testng/testng/5.8/testng-5.8.pom.sha1 (100%)