This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new cf448e4 Moving converter to maven folder
cf448e4 is described below
commit cf448e457b61c096bd374e689a032dc034484a05
Author: Martin Stockhammer <[email protected]>
AuthorDate: Wed Jul 10 23:30:35 2019 +0200
Moving converter to maven folder
---
archiva-modules/archiva-base/pom.xml | 1 -
.../archiva-maven-converter}/pom.xml | 8 ++++----
.../apache/archiva/converter/RepositoryConversionException.java | 0
.../archiva/converter/artifact/ArtifactConversionException.java | 0
.../org/apache/archiva/converter/artifact/ArtifactConverter.java | 0
.../apache/archiva/converter/artifact/LegacyRepositoryLayout.java | 0
.../archiva/converter/artifact/LegacyToDefaultConverter.java | 0
.../main/java/org/apache/archiva/converter/artifact/Messages.java | 0
.../converter/legacy/DefaultLegacyRepositoryConverter.java | 0
.../archiva/converter/legacy/LegacyConverterArtifactConsumer.java | 0
.../archiva/converter/legacy/LegacyRepositoryConverter.java | 0
.../src/main/resources/META-INF/spring-context.xml | 0
.../archiva/converter/DefaultRepositoryConverter.properties | 0
.../org/apache/archiva/converter/artifact/messages.properties | 0
.../src/test/expected-files/converted-artifact-one.pom | 0
.../src/test/expected-files/converted-artifact-three.pom | 0
.../src/test/expected-files/converted-artifact-two.pom | 0
.../src/test/expected-files/converted-v3-snapshot.pom | 0
.../src/test/expected-files/converted-v3-timestamped-snapshot.pom | 0
.../src/test/expected-files/converted-v3-warnings.pom | 0
.../src/test/expected-files/converted-v3.pom | 0
.../src/test/expected-files/maven-foo-plugin-1.0.pom | 0
.../src/test/expected-files/newversion-artifact-metadata.xml | 0
.../relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml | 0
.../relocated-v3artifact/1.0.0}/relocated-v3artifact-1.0.0.jar | 0
.../relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom | 0
.../relocated-test/relocated-v3artifact/maven-metadata.xml | 0
.../relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom | 0
.../src/test/expected-files/v3-artifact-metadata.xml | 0
.../src/test/expected-files/v3-snapshot-artifact-metadata.xml | 0
.../src/test/expected-files/v3-snapshot-metadata.xml | 0
.../src/test/expected-files/v3-timestamped-snapshot-metadata.xml | 0
.../src/test/expected-files/v3-version-metadata.xml | 0
.../src/test/expected-files/v4-artifact-metadata.xml | 0
.../src/test/expected-files/v4-snapshot-artifact-metadata.xml | 0
.../src/test/expected-files/v4-snapshot-metadata.xml | 0
.../src/test/expected-files/v4-timestamped-snapshot-metadata.xml | 0
.../src/test/expected-files/v4-version-metadata.xml | 0
.../org/apache/archiva/converter/RepositoryConverterTest.java | 0
.../archiva/converter/artifact/LegacyToDefaultConverterTest.java | 0
.../apache/archiva/converter/mock/MockArchivaAdministration.java | 0
.../src/test/resources/spring-context.xml | 0
.../1.0.0/incorrectArtifactMetadata-1.0.0.jar | 0
.../1.0.0/incorrectArtifactMetadata-1.0.0.pom | 0
.../test/incorrectArtifactMetadata/maven-metadata.xml | 0
.../incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar | 0
.../incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom | 0
.../incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml | 0
.../test/incorrectSnapshotMetadata/maven-metadata.xml | 0
.../src/test/source-repository/test/jars/artifact-one-1.0.0.jar | 0
.../src/test/source-repository/test/jars/artifact-three-1.0.0.jar | 0
.../src/test/source-repository/test/jars/artifact-two-1.0.0.jar | 0
.../test/source-repository/test/jars/dryrun-artifact-1.0.0.jar | 0
.../test/source-repository/test/jars/existing-artifact-1.0.0.jar | 0
.../source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar | 0
.../test/jars/incorrectMd5Artifact-1.0.0.jar.md5 | 0
.../source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar | 0
.../test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 | 0
.../test/source-repository/test/jars/modified-artifact-1.0.0.jar | 0
.../source-repository/test/jars/newversion-artifact-1.0.1.jar | 0
.../src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar | 0
.../source-repository/test/jars}/relocated-v3artifact-1.0.0.jar | 0
.../test/jars/rollback-created-artifact-1.0.0.jar | 0
.../source-repository/test/jars}/unmodified-artifact-1.0.0.jar | 0
.../source-repository/test/jars/v3-warnings-artifact-1.0.0.jar | 0
.../test/jars/v3artifact-1.0.0-20060105.130101-3.jar | 0
.../source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar | 0
.../src/test/source-repository/test/jars/v3artifact-1.0.0.jar | 0
.../test/jars/v4artifact-1.0.0-20060111.120115-1.jar | 0
.../source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar | 0
.../src/test/source-repository/test/jars/v4artifact-1.0.0.jar | 0
.../src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 | 0
.../test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 | 0
.../test/source-repository/test/plugins/maven-foo-plugin-1.0.jar | 0
.../src/test/source-repository/test/poms/artifact-one-1.0.0.pom | 0
.../src/test/source-repository/test/poms/artifact-three-1.0.0.pom | 0
.../src/test/source-repository/test/poms/artifact-two-1.0.0.pom | 0
.../test/source-repository/test/poms/dryrun-artifact-1.0.0.pom | 0
.../source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom | 0
.../source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom | 0
.../src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom | 0
.../test/source-repository/test/poms/modified-artifact-1.0.0.pom | 0
.../source-repository/test/poms/newversion-artifact-1.0.1.pom | 0
.../source-repository/test/poms/relocated-v3artifact-1.0.0.pom | 0
.../test/poms/rollback-created-artifact-1.0.0.pom | 0
.../source-repository/test/poms}/unmodified-artifact-1.0.0.pom | 0
.../source-repository/test/poms/v3-warnings-artifact-1.0.0.pom | 0
.../test/poms/v3artifact-1.0.0-20060105.130101-3.pom | 0
.../source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom | 0
.../src/test/source-repository/test/poms/v3artifact-1.0.0.pom | 0
.../test/poms/v4artifact-1.0.0-20060111.120115-1.pom | 0
.../source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom | 0
.../src/test/source-repository/test/poms/v4artifact-1.0.0.pom | 0
.../test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar | 0
.../test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom | 0
.../test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar | 0
.../test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom | 0
.../target-repository/test/newversion-artifact/maven-metadata.xml | 0
.../test/unmodified-artifact/1.0.0}/unmodified-artifact-1.0.0.jar | 0
.../test/unmodified-artifact/1.0.0}/unmodified-artifact-1.0.0.pom | 0
archiva-modules/archiva-maven/pom.xml | 1 +
101 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/archiva-modules/archiva-base/pom.xml
b/archiva-modules/archiva-base/pom.xml
index 50f24c6..a687a95 100644
--- a/archiva-modules/archiva-base/pom.xml
+++ b/archiva-modules/archiva-base/pom.xml
@@ -49,7 +49,6 @@
<module>archiva-proxy-api</module>
<module>archiva-proxy</module>
<module>archiva-transaction</module>
- <module>archiva-converter</module>
<module>archiva-repository-scanner</module>
<module>archiva-repository-admin</module>
<module>archiva-security-common</module>
diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml
similarity index 96%
rename from archiva-modules/archiva-base/archiva-converter/pom.xml
rename to archiva-modules/archiva-maven/archiva-maven-converter/pom.xml
index 8c81cdc..d0c937f 100644
--- a/archiva-modules/archiva-base/archiva-converter/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml
@@ -20,13 +20,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-base</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>archiva-converter</artifactId>
- <name>Archiva Base :: Repository Converter</name>
+ <artifactId>archiva-maven-converter</artifactId>
+ <name>Archiva :: Maven :: Repository Converter</name>
<properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/RepositoryConversionException.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/RepositoryConversionException.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/RepositoryConversionException.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/RepositoryConversionException.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/META-INF/spring-context.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/resources/META-INF/spring-context.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/META-INF/spring-context.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/resources/org/apache/archiva/converter/DefaultRepositoryConverter.properties
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/org/apache/archiva/converter/DefaultRepositoryConverter.properties
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/resources/org/apache/archiva/converter/DefaultRepositoryConverter.properties
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/org/apache/archiva/converter/DefaultRepositoryConverter.properties
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/main/resources/org/apache/archiva/converter/artifact/messages.properties
b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/org/apache/archiva/converter/artifact/messages.properties
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/main/resources/org/apache/archiva/converter/artifact/messages.properties
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/org/apache/archiva/converter/artifact/messages.properties
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-one.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-one.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-one.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-one.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-three.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-three.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-three.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-three.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-two.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-two.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-two.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-two.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-snapshot.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-snapshot.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-warnings.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-warnings.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/converted-v3.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/maven-foo-plugin-1.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/maven-foo-plugin-1.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/maven-foo-plugin-1.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/maven-foo-plugin-1.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/newversion-artifact-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/newversion-artifact-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-artifact-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-artifact-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-snapshot-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-snapshot-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v3-version-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-version-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v3-version-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-version-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-artifact-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-artifact-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-snapshot-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-snapshot-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v4-version-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-version-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/v4-version-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-version-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/resources/spring-context.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/resources/spring-context.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/resources/spring-context.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom
b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom
diff --git a/archiva-modules/archiva-maven/pom.xml
b/archiva-modules/archiva-maven/pom.xml
index 1dbd32e..b17c1b1 100644
--- a/archiva-modules/archiva-maven/pom.xml
+++ b/archiva-modules/archiva-maven/pom.xml
@@ -37,6 +37,7 @@
<modules>
<module>archiva-maven-common</module>
+ <module>archiva-maven-converter</module>
<module>archiva-maven-model</module>
<module>archiva-maven-metadata</module>
<module>archiva-maven-indexer</module>
