From a31528c40665cefc216a2cf8a37f1b00a29a55f8 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 7 Nov 2014 14:48:21 +0100
Subject: [PATCH] Update to Maven 3.2.3
---
pom.xml | 2 +-
.../org/eclipse/aether/internal/ant/AntModelResolver.java | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7f0eb73..03ef826 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<sonatypeOssDistMgmtSnapshotsId>sonatype-nexus-snapshots</sonatypeOssDistMgmtSnapshotsId>
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
- <mavenVersion>3.1.0</mavenVersion>
+ <mavenVersion>3.2.3</mavenVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>
</properties>
diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java
index dc7ef72..e0d40c5 100644
--- a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java
+++ b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java
@@ -16,6 +16,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.FileModelSource;
import org.apache.maven.model.building.ModelSource;
@@ -77,7 +78,13 @@ class AntModelResolver
public void addRepository( Repository repository )
throws InvalidRepositoryException
{
- if ( !repositoryIds.add( repository.getId() ) )
+ addRepository( repository, false );
+ }
+
+ public void addRepository( Repository repository, boolean replace )
+ throws InvalidRepositoryException
+ {
+ if ( !repositoryIds.add( repository.getId() ) && !replace )
{
return;
}
@@ -145,4 +152,10 @@ class AntModelResolver
return new FileModelSource( pomFile );
}
+ public ModelSource resolveModel( Parent parent )
+ throws UnresolvableModelException
+ {
+ return resolveModel( parent.getGroupId(), parent.getArtifactId(), parent.getVersion() );
+ }
+
}
--
1.9.3