From 3b8e3f12500fb77db54e7dd672b77bdab3cf82ad Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky@redhat.com> Date: Fri, 24 Jun 2011 15:08:57 +0200 Subject: [PATCH] Add maven3 compatibility deps --- maven-ant/pom.xml | 5 +++++ maven-artifact-resolver/pom.xml | 5 +++++ maven-dependency-tree/pom.xml | 10 ++++++++++ .../tree/DefaultDependencyTreeBuilder.java | 7 ++----- .../tree/DependencyTreeResolutionListener.java | 5 +++++ maven-downloader/pom.xml | 10 ++++++++++ maven-repository-builder/pom.xml | 5 +++++ maven-shared-io/pom.xml | 5 +++++ 8 files changed, 47 insertions(+), 5 deletions(-) diff --git a/maven-ant/pom.xml b/maven-ant/pom.xml index 3abab27..22ba05f 100644 --- a/maven-ant/pom.xml +++ b/maven-ant/pom.xml @@ -59,6 +59,11 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>3.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>2.0.1</version> </dependency> diff --git a/maven-artifact-resolver/pom.xml b/maven-artifact-resolver/pom.xml index 307dc69..b94028e 100644 --- a/maven-artifact-resolver/pom.xml +++ b/maven-artifact-resolver/pom.xml @@ -43,6 +43,11 @@ under the License. <dependencies> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>3.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-artifact-manager</artifactId> <version>2.1.0</version> <scope>provided</scope> diff --git a/maven-dependency-tree/pom.xml b/maven-dependency-tree/pom.xml index 0710791..4ed5c7f 100644 --- a/maven-dependency-tree/pom.xml +++ b/maven-dependency-tree/pom.xml @@ -55,6 +55,16 @@ <dependencies> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>3.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>3.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>2.0.8</version> </dependency> diff --git a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java index bfce140..f1a0ec8 100644 --- a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java +++ b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java @@ -29,6 +29,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactCollector; import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolutionResult; +import org.apache.maven.artifact.resolver.ResolutionListener; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.InvalidDependencyVersionException; @@ -96,14 +97,10 @@ public class DefaultDependencyTreeBuilder extends AbstractLogEnabled implements result = collector.collect( dependencyArtifacts, project.getArtifact(), managedVersions, repository, project.getRemoteArtifactRepositories(), metadataSource, filter, - Collections.singletonList( listener ) ); + Collections.singletonList((ResolutionListener) listener ) ); return listener.getRootNode(); } - catch ( ArtifactResolutionException exception ) - { - throw new DependencyTreeBuilderException( "Cannot build project dependency tree", exception ); - } catch ( InvalidDependencyVersionException e ) { throw new DependencyTreeBuilderException( "Invalid dependency version for artifact " diff --git a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java index 492f382..0d6b483 100644 --- a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java +++ b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java @@ -362,6 +362,11 @@ public class DependencyTreeResolutionListener implements ResolutionListener, Res managedScopes.put( replacement.getId(), artifact.getScope() ); } } + + public void manageArtifactSystemPath( Artifact artifact, Artifact replacement ) + { + throw new UnsupportedOperationException(); + } // public methods --------------------------------------------------------- diff --git a/maven-downloader/pom.xml b/maven-downloader/pom.xml index d9b6a45..f03a4c8 100644 --- a/maven-downloader/pom.xml +++ b/maven-downloader/pom.xml @@ -48,6 +48,16 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>3.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>3.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> <version>2.0</version> </dependency> diff --git a/maven-repository-builder/pom.xml b/maven-repository-builder/pom.xml index 695d859..17c2476 100644 --- a/maven-repository-builder/pom.xml +++ b/maven-repository-builder/pom.xml @@ -50,6 +50,11 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>3.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>2.0.4</version> </dependency> diff --git a/maven-shared-io/pom.xml b/maven-shared-io/pom.xml index 325cdd0..743e37a 100644 --- a/maven-shared-io/pom.xml +++ b/maven-shared-io/pom.xml @@ -53,6 +53,11 @@ <!-- Maven --> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>3.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> <version>2.0.2</version> </dependency> -- 1.7.5.4