This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from 3d2006a Improving error handling and log for repository scan
new f1ae6b4 Moving mavenmerge class to archiva-maven-repository module
new 36249f6 Trying to fix merge test error on build server
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../archiva-maven/archiva-maven-repository/pom.xml | 10 ++++
.../merge/Maven2RepositoryMerger.java | 7 +++
.../archiva/configuration/StubConfiguration.java | 0
.../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
.../archiva-rest/archiva-rest-services/pom.xml | 4 ++
.../services/DefaultMergeRepositoriesService.java | 55 ++++++++++++++-------
.../rest/services/AbstractArchivaRestTest.java | 15 ++++--
.../archiva/rest/services/BrowseServiceTest.java | 2 +-
.../services/MergeRepositoriesServiceTest.java | 5 +-
archiva-modules/plugins/metadata-store-jcr/pom.xml | 5 --
.../plugins/stage-repository-merge/pom.xml | 30 -----------
.../stagerepository/merge/RepositoryMerger.java | 3 ++
42 files changed, 77 insertions(+), 63 deletions(-)
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
(100%)
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%)
