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 79bee6e Combining maven specific packages into subdirectory and
package structure.
79bee6e is described below
commit 79bee6e84771de9b71e7d957e9f10a17364520ed
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sun May 5 21:46:25 2019 +0200
Combining maven specific packages into subdirectory and package structure.
---
.../archiva-consumer-archetype/pom.xml | 4 +--
.../resourcesstatic/archetype-resources/pom.xml | 4 +--
.../archiva-core-consumers/pom.xml | 4 +--
.../archiva-lucene-consumers/pom.xml | 4 +--
.../archiva-base/archiva-proxy-maven/pom.xml | 4 +--
.../archiva-base/archiva-repository-layer/pom.xml | 4 +--
archiva-modules/archiva-base/pom.xml | 4 ---
.../archiva-maven-common}/pom.xml | 8 +++---
.../archiva/proxy/maven/DebugTransferListener.java | 0
.../archiva/proxy/maven/DefaultWagonFactory.java | 0
.../apache/archiva/proxy/maven/WagonFactory.java | 0
.../archiva/proxy/maven/WagonFactoryException.java | 0
.../archiva/proxy/maven/WagonFactoryRequest.java | 0
.../archiva-maven-indexer}/pom.xml | 12 ++++-----
.../maven/DefaultIndexUpdateSideEffect.java | 0
.../archiva/indexer/maven/MavenIndexContext.java | 0
.../archiva/indexer/maven/MavenIndexManager.java | 0
.../indexer/maven/merger/DefaultIndexMerger.java | 0
.../maven/search/MavenRepositorySearch.java | 0
.../DefaultMergedRemoteIndexesScheduler.java | 0
.../apache/archiva/indexer/merger/IndexMerger.java | 0
.../indexer/merger/IndexMergerException.java | 0
.../archiva/indexer/merger/IndexMergerRequest.java | 0
.../indexer/merger/MergedRemoteIndexesTask.java | 0
.../merger/MergedRemoteIndexesTaskRequest.java | 0
.../merger/MergedRemoteIndexesTaskResult.java | 0
.../indexer/merger/TemporaryGroupIndex.java | 0
.../indexer/merger/TemporaryGroupIndexCleaner.java | 0
.../search/NoClassifierArtifactInfoFilter.java | 0
.../apache/archiva/indexer/util/SearchUtil.java | 0
.../src/main/resources/META-INF/spring-context.xml | 0
.../indexer/maven/MavenIndexManagerTest.java | 0
.../search/AbstractMavenRepositorySearch.java | 0
.../search/MavenRepositorySearchOSGITest.java | 0
.../search/MavenRepositorySearchPaginateTest.java | 0
.../maven/search/MavenRepositorySearchTest.java | 0
.../archiva-search/1.0/archiva-search-1.0.jar | Bin
.../archiva-search/1.0/archiva-search-1.0.pom | 0
.../archiva-search/1.1/archiva-search-1.1.jar | Bin
.../archiva-search/1.1/archiva-search-1.1.pom | 0
.../1.0/artifactid-numeric-1.0.jar | 0
.../1.0/artifactid-numeric-1.0.pom | 0
.../1.0/artifactid-numeric123-1.0.jar | 0
.../1.0/artifactid-numeric123-1.0.pom | 0
.../classname-search/1.0/classname-search-1.0.jar | Bin
.../classname-search/1.0/classname-search-1.0.pom | 0
.../1.0/archiva-search-1.0-patch1.jar | Bin
.../1.0/archiva-search-1.0-sources.jar | Bin
.../archiva-search/1.0/archiva-search-1.0.jar | Bin
.../archiva-search/1.0/archiva-search-1.0.pom | 0
.../archiva/archiva-test/1.0/archiva-test-1.0.jar | Bin
.../archiva/archiva-test/1.0/archiva-test-1.0.pom | 0
.../archiva/archiva-test/2.0/archiva-test-2.0.jar | Bin
.../archiva/archiva-test/2.0/archiva-test-2.0.pom | 0
.../archiva-webapp/1.0/archiva-webapp-1.0.pom | 0
.../archiva-webapp/1.0/archiva-webapp-1.0.war | 0
.../1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war | Bin
.../org.apache.felix.bundlerepository-1.6.6.jar | Bin
.../org.apache.felix.bundlerepository-1.6.6.pom | 0
.../src/test/repo-release/.index/_8.fdt | Bin
.../src/test/repo-release/.index/_8.fdx | Bin
.../src/test/repo-release/.index/_8.fnm | Bin
.../src/test/repo-release/.index/_8.nvd | Bin
.../src/test/repo-release/.index/_8.nvm | Bin
.../src/test/repo-release/.index/_8.si | Bin
.../src/test/repo-release/.index/_8_Lucene41_0.doc | Bin
.../src/test/repo-release/.index/_8_Lucene41_0.pos | Bin
.../src/test/repo-release/.index/_8_Lucene41_0.tim | Bin
.../src/test/repo-release/.index/_8_Lucene41_0.tip | Bin
.../src/test/repo-release/.index/segments.gen | Bin
.../src/test/repo-release/.index/segments_9 | Bin
.../src/test/repo-release/.index/timestamp | Bin
.../src/test/repo-release/.index/write.lock | 0
.../src/test/resources/log4j2-test.xml | 0
.../src/test/resources/spring-context.xml | 0
.../archiva-maven-metadata}/pom.xml | 8 +++---
.../maven2/metadata/MavenMetadataReader.java | 0
.../archiva-maven-model}/pom.xml | 9 +++----
.../org/apache/archiva/maven2/model/Artifact.java | 0
.../org/apache/archiva/maven2/model/TreeEntry.java | 0
.../archiva-maven2-model => archiva-maven}/pom.xml | 28 ++++++++++-----------
.../archiva-scheduler-indexing-maven2/pom.xml | 4 +--
.../archiva-rest/archiva-rest-api/pom.xml | 4 +--
.../archiva-rest/archiva-rest-services/pom.xml | 8 +++---
.../archiva-web/archiva-security/pom.xml | 4 +--
archiva-modules/archiva-web/archiva-webapp/pom.xml | 4 +--
archiva-modules/archiva-web/archiva-webdav/pom.xml | 4 +--
archiva-modules/plugins/maven2-repository/pom.xml | 8 +++---
archiva-modules/pom.xml | 2 +-
pom.xml | 16 ++++++------
90 files changed, 71 insertions(+), 76 deletions(-)
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
index 8137567..dd0fee6 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
@@ -60,8 +60,8 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-indexer</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-indexer</artifactId>
<version>${archivaVersion}</version>
</dependency>
<dependency>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
index e0f07c0..a976949 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
@@ -80,8 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-indexer</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-indexer</artifactId>
<version>${archiva.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index 6e3db0c..5dd419e 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -166,8 +166,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-indexer</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-indexer</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index 03c9c12..4140617 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -141,8 +141,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-indexer</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-indexer</artifactId>
<scope>test</scope>
</dependency>
diff --git a/archiva-modules/archiva-base/archiva-proxy-maven/pom.xml
b/archiva-modules/archiva-base/archiva-proxy-maven/pom.xml
index 81119f0..b6ae5a1 100644
--- a/archiva-modules/archiva-base/archiva-proxy-maven/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy-maven/pom.xml
@@ -34,8 +34,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-common</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index b134f24..0452091 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -58,8 +58,8 @@
<artifactId>archiva-xml-tools</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-metadata</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-metadata</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/archiva-modules/archiva-base/pom.xml
b/archiva-modules/archiva-base/pom.xml
index 13009cb..41e594e 100644
--- a/archiva-modules/archiva-base/pom.xml
+++ b/archiva-modules/archiva-base/pom.xml
@@ -43,8 +43,6 @@
<module>archiva-plexus-bridge</module>
<module>archiva-policies</module>
<module>archiva-repository-api</module>
- <module>archiva-maven2-common</module>
- <module>archiva-maven2-indexer</module>
<module>archiva-consumers</module>
<module>archiva-repository-layer</module>
<module>archiva-xml-tools</module>
@@ -56,7 +54,5 @@
<module>archiva-repository-scanner</module>
<module>archiva-repository-admin</module>
<module>archiva-security-common</module>
- <module>archiva-maven2-metadata</module>
- <module>archiva-maven2-model</module>
</modules>
</project>
diff --git a/archiva-modules/archiva-base/archiva-maven2-common/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-common/pom.xml
similarity index 90%
rename from archiva-modules/archiva-base/archiva-maven2-common/pom.xml
rename to archiva-modules/archiva-maven/archiva-maven-common/pom.xml
index 0981210..9e40527 100644
--- a/archiva-modules/archiva-base/archiva-maven2-common/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-common/pom.xml
@@ -22,14 +22,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>archiva-base</artifactId>
- <groupId>org.apache.archiva</groupId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>archiva-maven2-common</artifactId>
- <name>Archiva Base :: Maven2 Common</name>
+ <artifactId>archiva-maven-common</artifactId>
+ <name>Archiva :: Maven :: Common</name>
<dependencies>
<dependency>
diff --git
a/archiva-modules/archiva-base/archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven/DebugTransferListener.java
b/archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/proxy/maven/DebugTransferListener.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven/DebugTransferListener.java
rename to
archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/proxy/maven/DebugTransferListener.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven/DefaultWagonFactory.java
b/archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/proxy/maven/DefaultWagonFactory.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven/DefaultWagonFactory.java
rename to
archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/proxy/maven/DefaultWagonFactory.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactory.java
b/archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactory.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactory.java
rename to
archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactory.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactoryException.java
b/archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactoryException.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactoryException.java
rename to
archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactoryException.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactoryRequest.java
b/archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactoryRequest.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactoryRequest.java
rename to
archiva-modules/archiva-maven/archiva-maven-common/src/main/java/org/apache/archiva/proxy/maven/WagonFactoryRequest.java
diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml
similarity index 97%
rename from archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml
rename to archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml
index 8911af1..2cfb263 100644
--- a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-indexer/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-maven2-indexer</artifactId>
- <name>Archiva Base :: Maven2 Indexer</name>
+ <artifactId>archiva-maven-indexer</artifactId>
+ <name>Archiva :: Maven :: Indexer</name>
<properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
@@ -51,8 +51,8 @@
<artifactId>archiva-proxy</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-common</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/DefaultIndexUpdateSideEffect.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/DefaultIndexUpdateSideEffect.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/DefaultIndexUpdateSideEffect.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/DefaultIndexUpdateSideEffect.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexContext.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexContext.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexContext.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexContext.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/merger/DefaultIndexMerger.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/merger/DefaultIndexMerger.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/merger/DefaultIndexMerger.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/merger/DefaultIndexMerger.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultMergedRemoteIndexesScheduler.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultMergedRemoteIndexesScheduler.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultMergedRemoteIndexesScheduler.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultMergedRemoteIndexesScheduler.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerException.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerException.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerException.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerException.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerRequest.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerRequest.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerRequest.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerRequest.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTask.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTask.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTask.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTask.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskRequest.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskRequest.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskRequest.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskRequest.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskResult.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskResult.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskResult.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskResult.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndex.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndex.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndex.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndex.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/search/NoClassifierArtifactInfoFilter.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/search/NoClassifierArtifactInfoFilter.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/search/NoClassifierArtifactInfoFilter.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/search/NoClassifierArtifactInfoFilter.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/resources/META-INF/spring-context.xml
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/resources/META-INF/spring-context.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/main/resources/META-INF/spring-context.xml
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/resources/META-INF/spring-context.xml
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchTest.java
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchTest.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchTest.java
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchTest.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.pom
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.pom
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.pom
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.jar
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.pom
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.fdt
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.fdt
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.fdt
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.fdt
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.fdx
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.fdx
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.fdx
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.fdx
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.fnm
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.fnm
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.fnm
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.fnm
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.nvd
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.nvd
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.nvd
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.nvd
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.nvm
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.nvm
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.nvm
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.nvm
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.si
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.si
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8.si
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8.si
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/segments.gen
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/segments.gen
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/segments.gen
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/segments.gen
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/segments_9
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/segments_9
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/segments_9
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/segments_9
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/timestamp
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/timestamp
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/timestamp
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/timestamp
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/write.lock
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/write.lock
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/repo-release/.index/write.lock
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/repo-release/.index/write.lock
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/log4j2-test.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/resources/log4j2-test.xml
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/log4j2-test.xml
diff --git
a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/resources/spring-context.xml
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/spring-context.xml
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-indexer/src/test/resources/spring-context.xml
rename to
archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/spring-context.xml
diff --git a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml
similarity index 90%
rename from archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
rename to archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml
index c32019e..f160434 100644
--- a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml
@@ -20,14 +20,14 @@
<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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<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>
- <artifactId>archiva-maven2-metadata</artifactId>
+ <artifactId>archiva-maven-metadata</artifactId>
- <name>Archiva Base :: Maven 2 Metadata</name>
+ <name>Archiva :: Maven :: Metadata</name>
<properties>
diff --git
a/archiva-modules/archiva-base/archiva-maven2-metadata/src/main/java/org/apache/archiva/maven2/metadata/MavenMetadataReader.java
b/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/maven2/metadata/MavenMetadataReader.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-metadata/src/main/java/org/apache/archiva/maven2/metadata/MavenMetadataReader.java
rename to
archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/maven2/metadata/MavenMetadataReader.java
diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-model/pom.xml
similarity index 89%
copy from archiva-modules/archiva-base/archiva-maven2-model/pom.xml
copy to archiva-modules/archiva-maven/archiva-maven-model/pom.xml
index 7007ae5..2e8d16e 100644
--- a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-model/pom.xml
@@ -20,14 +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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<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>
- <artifactId>archiva-maven2-model</artifactId>
-
- <name>Archiva Base :: Maven 2 Model</name>
+ <artifactId>archiva-maven-model</artifactId>
+ <name>Archiva :: Maven :: Model</name>
<properties>
diff --git
a/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/Artifact.java
b/archiva-modules/archiva-maven/archiva-maven-model/src/main/java/org/apache/archiva/maven2/model/Artifact.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/Artifact.java
rename to
archiva-modules/archiva-maven/archiva-maven-model/src/main/java/org/apache/archiva/maven2/model/Artifact.java
diff --git
a/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
b/archiva-modules/archiva-maven/archiva-maven-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
similarity index 100%
rename from
archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
rename to
archiva-modules/archiva-maven/archiva-maven-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
b/archiva-modules/archiva-maven/pom.xml
similarity index 68%
rename from archiva-modules/archiva-base/archiva-maven2-model/pom.xml
rename to archiva-modules/archiva-maven/pom.xml
index 7007ae5..38580ee 100644
--- a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
+++ b/archiva-modules/archiva-maven/pom.xml
@@ -17,28 +17,28 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<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/xsd/maven-4.0.0.xsd";>
+
+<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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-base</artifactId>
+ <artifactId>archiva-modules</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>archiva-maven2-model</artifactId>
-
- <name>Archiva Base :: Maven 2 Model</name>
-
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven</artifactId>
+ <name>Archiva :: Maven</name>
+ <packaging>pom</packaging>
<properties>
- <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ <site.staging.base>${project.parent.basedir}</site.staging.base>
</properties>
- <dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- </dependencies>
-
+ <modules>
+ <module>archiva-maven-common</module>
+ <module>archiva-maven-model</module>
+ <module>archiva-maven-metadata</module>
+ <module>archiva-maven-indexer</module>
+ </modules>
</project>
diff --git
a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
index fe377f5..1485595 100644
---
a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
+++
b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
@@ -79,8 +79,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-indexer</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-indexer</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
index e2daaab..4de49d7 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
@@ -56,8 +56,8 @@
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-model</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-model</artifactId>
</dependency>
<dependency>
diff --git
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index b80e6b4..b59d808 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -83,8 +83,8 @@
<artifactId>archiva-scheduler-repository</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-indexer</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-indexer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -96,8 +96,8 @@
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-model</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-model</artifactId>
</dependency>
<dependency>
diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml
b/archiva-modules/archiva-web/archiva-security/pom.xml
index e9b3f11..4a1a5d1 100644
--- a/archiva-modules/archiva-web/archiva-security/pom.xml
+++ b/archiva-modules/archiva-web/archiva-security/pom.xml
@@ -201,8 +201,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-indexer</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-indexer</artifactId>
<scope>test</scope>
</dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml
b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 7020654..2651ad5 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -66,8 +66,8 @@
<artifactId>archiva-scheduler-repository</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-indexer</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-indexer</artifactId>
</dependency>
<dependency>
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml
b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 45ccdd8..8d4ba14 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -96,8 +96,8 @@
<artifactId>archiva-security</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-indexer</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-indexer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml
b/archiva-modules/plugins/maven2-repository/pom.xml
index d16eb97..e01eb3a 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -45,8 +45,8 @@
<artifactId>metadata-repository-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-metadata</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-metadata</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -124,8 +124,8 @@
<artifactId>archiva-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-model</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml
index 0651397..d4cf831 100644
--- a/archiva-modules/pom.xml
+++ b/archiva-modules/pom.xml
@@ -39,11 +39,11 @@
<modules>
<module>archiva-base</module>
-
<module>archiva-scheduler</module>
<module>archiva-web</module>
<module>metadata</module>
<module>plugins</module>
+ <module>archiva-maven</module>
</modules>
<build>
diff --git a/pom.xml b/pom.xml
index 57e873b..e1649b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,13 +159,13 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-common</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-metadata</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-metadata</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -174,8 +174,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-model</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -301,8 +301,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-maven2-indexer</artifactId>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-indexer</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
