diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-06-15 15:30:53 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-06-15 15:30:53 +0000 |
| commit | b3603c5c4365a15faa46b5c9af4b8bbbac03659a (patch) | |
| tree | 43fabf4c016612f9c6abb18fbca915e13c381b57 /archiva-modules | |
| parent | aefe91d87c51a1261b0b04d522c250f2a13a6d24 (diff) | |
| download | archiva-b3603c5c4365a15faa46b5c9af4b8bbbac03659a.tar.gz archiva-b3603c5c4365a15faa46b5c9af4b8bbbac03659a.zip | |
back to maven2 api for dependency tree
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1136082 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
4 files changed, 8 insertions, 24 deletions
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 4c5373692..2d78604cf 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 65920b9d1..f33940dba 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -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> diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index 0344dbb49..ae853c990 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -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> diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java index 4ab685160..a66da60bc 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java @@ -62,7 +62,6 @@ import org.apache.maven.model.building.ModelBuilder; 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 DefaultDependencyTreeBuilder 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, |