|
 |
df135e4 |
From 15873d368898c7f4f7d7673464ad59135024ea3b Mon Sep 17 00:00:00 2001
|
|
|
5a5df48 |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
5a5df48 |
Date: Fri, 7 Nov 2014 14:48:21 +0100
|
|
|
df135e4 |
Subject: [PATCH 1/2] Compatibility with Maven 3.4.0
|
|
|
5a5df48 |
|
|
|
df135e4 |
This adds compatibility with latest Maven APIs by implementing new
|
|
|
df135e4 |
interface methods introduced in Maven 3.4.0 (MNG-5663 and others).
|
|
|
df135e4 |
|
|
|
df135e4 |
Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
5a5df48 |
---
|
|
|
df135e4 |
.../aether/internal/ant/AntModelResolver.java | 22 +++++++++++++++++++++-
|
|
|
df135e4 |
1 file changed, 21 insertions(+), 1 deletion(-)
|
|
|
5a5df48 |
|
|
|
5a5df48 |
diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java
|
|
|
df135e4 |
index dc7ef72..a177b17 100644
|
|
|
5a5df48 |
--- a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java
|
|
|
5a5df48 |
+++ b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java
|
|
|
df135e4 |
@@ -16,6 +16,8 @@ import java.util.HashSet;
|
|
|
5a5df48 |
import java.util.List;
|
|
|
5a5df48 |
import java.util.Set;
|
|
|
5a5df48 |
|
|
|
df135e4 |
+import org.apache.maven.model.Dependency;
|
|
|
5a5df48 |
+import org.apache.maven.model.Parent;
|
|
|
5a5df48 |
import org.apache.maven.model.Repository;
|
|
|
5a5df48 |
import org.apache.maven.model.building.FileModelSource;
|
|
|
5a5df48 |
import org.apache.maven.model.building.ModelSource;
|
|
|
df135e4 |
@@ -77,7 +79,13 @@ class AntModelResolver
|
|
|
5a5df48 |
public void addRepository( Repository repository )
|
|
|
5a5df48 |
throws InvalidRepositoryException
|
|
|
5a5df48 |
{
|
|
|
5a5df48 |
- if ( !repositoryIds.add( repository.getId() ) )
|
|
|
5a5df48 |
+ addRepository( repository, false );
|
|
|
5a5df48 |
+ }
|
|
|
5a5df48 |
+
|
|
|
5a5df48 |
+ public void addRepository( Repository repository, boolean replace )
|
|
|
5a5df48 |
+ throws InvalidRepositoryException
|
|
|
5a5df48 |
+ {
|
|
|
5a5df48 |
+ if ( !repositoryIds.add( repository.getId() ) && !replace )
|
|
|
5a5df48 |
{
|
|
|
5a5df48 |
return;
|
|
|
5a5df48 |
}
|
|
|
df135e4 |
@@ -145,4 +153,16 @@ class AntModelResolver
|
|
|
5a5df48 |
return new FileModelSource( pomFile );
|
|
|
5a5df48 |
}
|
|
|
5a5df48 |
|
|
|
5a5df48 |
+ public ModelSource resolveModel( Parent parent )
|
|
|
5a5df48 |
+ throws UnresolvableModelException
|
|
|
5a5df48 |
+ {
|
|
|
5a5df48 |
+ return resolveModel( parent.getGroupId(), parent.getArtifactId(), parent.getVersion() );
|
|
|
5a5df48 |
+ }
|
|
|
5a5df48 |
+
|
|
|
df135e4 |
+ public ModelSource resolveModel( Dependency dependency )
|
|
|
df135e4 |
+ throws UnresolvableModelException
|
|
|
df135e4 |
+ {
|
|
|
df135e4 |
+ return resolveModel( dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() );
|
|
|
df135e4 |
+ }
|
|
|
df135e4 |
+
|
|
|
5a5df48 |
}
|
|
|
5a5df48 |
--
|
|
|
df135e4 |
2.7.4
|
|
|
5a5df48 |
|