@@ -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> |
@@ -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> |
@@ -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> | |||
@@ -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> | |||
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |
@@ -0,0 +1,44 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<!-- | |||
~ Licensed to the Apache Software Foundation (ASF) under one | |||
~ or more contributor license agreements. See the NOTICE file | |||
~ distributed with this work for additional information | |||
~ regarding copyright ownership. The ASF licenses this file | |||
~ to you under the Apache License, Version 2.0 (the | |||
~ "License"); you may not use this file except in compliance | |||
~ with the License. You may obtain a copy of the License at | |||
~ | |||
~ http://www.apache.org/licenses/LICENSE-2.0 | |||
~ | |||
~ Unless required by applicable law or agreed to in writing, | |||
~ software distributed under the License is distributed on an | |||
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |||
~ KIND, either express or implied. See the License for the | |||
~ 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/maven-v4_0_0.xsd"> | |||
<modelVersion>4.0.0</modelVersion> | |||
<parent> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-modules</artifactId> | |||
<version>3.0.0-SNAPSHOT</version> | |||
</parent> | |||
<groupId>org.apache.archiva.maven</groupId> | |||
<artifactId>archiva-maven</artifactId> | |||
<name>Archiva :: Maven</name> | |||
<packaging>pom</packaging> | |||
<properties> | |||
<site.staging.base>${project.parent.basedir}</site.staging.base> | |||
</properties> | |||
<modules> | |||
<module>archiva-maven-common</module> | |||
<module>archiva-maven-model</module> | |||
<module>archiva-maven-metadata</module> | |||
<module>archiva-maven-indexer</module> | |||
</modules> | |||
</project> |
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> | |||
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |