@@ -80,8 +80,8 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>maven2-repository</artifactId> | |||
<groupId>org.apache.archiva.maven</groupId> | |||
<artifactId>archiva-maven-repository</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
@@ -186,8 +186,8 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>maven2-repository</artifactId> | |||
<groupId>org.apache.archiva.maven</groupId> | |||
<artifactId>archiva-maven-repository</artifactId> | |||
<version>${archiva.version}</version> | |||
<scope>test</scope> | |||
</dependency> |
@@ -73,30 +73,18 @@ | |||
<artifactId>metadata-repository-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>metadata-model-maven2</artifactId> | |||
<groupId>org.apache.archiva.maven</groupId> | |||
<artifactId>archiva-maven-metadata</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-plexus-bridge</artifactId> | |||
</dependency> | |||
<!-- | |||
<dependency> | |||
<groupId>org.codehaus.plexus</groupId> | |||
<artifactId>plexus-digest</artifactId> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>org.codehaus.plexus</groupId> | |||
<artifactId>plexus-component-api</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
--> | |||
<!-- test dependencies --> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>maven2-repository</artifactId> | |||
<groupId>org.apache.archiva.maven</groupId> | |||
<artifactId>archiva-maven-repository</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> |
@@ -126,8 +126,8 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>maven2-repository</artifactId> | |||
<groupId>org.apache.archiva.maven</groupId> | |||
<artifactId>archiva-maven-repository</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> |
@@ -98,15 +98,9 @@ | |||
<artifactId>archiva-common</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>maven2-repository</artifactId> | |||
</dependency> | |||
<!-- | |||
<dependency> | |||
<groupId>org.codehaus.plexus</groupId> | |||
<artifactId>plexus-i18n</artifactId> | |||
<groupId>org.apache.archiva.maven</groupId> | |||
<artifactId>archiva-maven-repository</artifactId> | |||
</dependency> | |||
--> | |||
<dependency> | |||
<groupId>org.apache.maven.wagon</groupId> | |||
<artifactId>wagon-http</artifactId> |
@@ -79,8 +79,8 @@ | |||
<artifactId>metadata-model</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>maven2-repository</artifactId> | |||
<groupId>org.apache.archiva.maven</groupId> | |||
<artifactId>archiva-maven-repository</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.inject</groupId> |
@@ -80,20 +80,6 @@ | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>metadata-model</artifactId> | |||
</dependency> | |||
<!--dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>maven2-repository</artifactId> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>commons-logging</groupId> | |||
<artifactId>commons-logging-api</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>log4j</groupId> | |||
<artifactId>log4j</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency--> | |||
<dependency> | |||
<groupId>org.apache.maven.wagon</groupId> | |||
<artifactId>wagon-http</artifactId> |
@@ -47,7 +47,6 @@ | |||
<module>archiva-repository-layer</module> | |||
<module>archiva-xml-tools</module> | |||
<module>archiva-proxy-api</module> | |||
<module>archiva-proxy-maven</module> | |||
<module>archiva-proxy</module> | |||
<module>archiva-transaction</module> | |||
<module>archiva-converter</module> |
@@ -43,6 +43,14 @@ | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-xml-tools</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>metadata-model</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>commons-lang</groupId> | |||
<artifactId>commons-lang</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>commons-io</groupId> | |||
<artifactId>commons-io</artifactId> |
@@ -21,12 +21,12 @@ | |||
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> | |||
<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> | |||
<artifactId>archiva-proxy-maven</artifactId> | |||
<name>Archiva Base :: Proxy Maven</name> | |||
<artifactId>archiva-maven-proxy</artifactId> | |||
<name>Archiva :: Maven :: Proxy</name> | |||
<properties> | |||
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> | |||
@@ -84,13 +84,6 @@ | |||
<groupId>commons-logging</groupId> | |||
<artifactId>commons-logging</artifactId> | |||
</dependency> | |||
<!-- | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>maven2-repository</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
--> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-test-utils</artifactId> |