Author: olamy
Date: Wed Jun 15 15:30:53 2011
New Revision: 1136082
URL: http://svn.apache.org/viewvc?rev=1136082&view=rev
Log:
back to maven2 api for dependency tree
Modified:
archiva/trunk/archiva-cli/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-cli/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-cli/pom.xml?rev=1136082&r1=1136081&r2=1136082&view=diff
==============================================================================
--- archiva/trunk/archiva-cli/pom.xml (original)
+++ archiva/trunk/archiva-cli/pom.xml Wed Jun 15 15:30:53 2011
@@ -59,6 +59,10 @@
<version>7</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -67,10 +71,6 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml?rev=1136082&r1=1136081&r2=1136082&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
Wed Jun 15 15:30:53 2011
@@ -39,7 +39,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1136082&r1=1136081&r2=1136082&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Jun 15
15:30:53 2011
@@ -321,12 +321,6 @@
<version>${maven3x.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${maven3x.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
</dependency>
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=1136082&r1=1136081&r2=1136082&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Wed Jun 15
15:30:53 2011
@@ -68,15 +68,15 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
+ <artifactId>maven-artifact-manager</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
+ <artifactId>maven-repository-metadata</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
+ <artifactId>maven-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java?rev=1136082&r1=1136081&r2=1136082&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
Wed Jun 15 15:30:53 2011
@@ -62,7 +62,6 @@ import org.apache.maven.model.building.M
import org.apache.maven.model.building.ModelBuildingException;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.resolution.UnresolvableModelException;
-import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest;
import org.apache.maven.shared.dependency.tree.DependencyNode;
import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
import
org.apache.maven.shared.dependency.tree.DependencyTreeResolutionListener;
@@ -548,19 +547,6 @@ public class DefaultDependencyTreeBuilde
return new ArrayList<ArtifactVersion>( versions );
}
- public ResolutionGroup retrieve( MetadataResolutionRequest
metadataResolutionRequest )
- throws ArtifactMetadataRetrievalException
- {
- //TODO
- return null;
- }
-
- public List<ArtifactVersion> retrieveAvailableVersions(
MetadataResolutionRequest metadataResolutionRequest )
- throws ArtifactMetadataRetrievalException
- {
- //TODO
- return null;
- }
public List<ArtifactVersion>
retrieveAvailableVersionsFromDeploymentRepository( Artifact artifact,
ArtifactRepository artifactRepository,
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1136082&r1=1136081&r2=1136082&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Jun 15 15:30:53 2011
@@ -64,6 +64,7 @@
<properties>
<struts.version>2.2.3</struts.version>
<maven3x.version>3.0.3</maven3x.version>
+ <maven.version>2.0.8</maven.version>
<wagon.version>1.0-beta-5</wagon.version>
<redback.version>1.3-SNAPSHOT</redback.version>
<jetty.version>6.1.19</jetty.version>
@@ -568,6 +569,7 @@
<artifactId>maven-model-builder</artifactId>
<version>${maven3x.version}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
@@ -578,6 +580,28 @@
<artifactId>maven-core</artifactId>
<version>${maven3x.version}</version>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>${maven.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository-metadata</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-digest</artifactId>
@@ -1083,16 +1107,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${maven3x.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-repository-metadata</artifactId>
- <version>${maven3x.version}</version>
- </dependency>
+
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
