|
 |
39fddbe |
From 240b4be7a73fb83f14065cca917615a06a3b4fb0 Mon Sep 17 00:00:00 2001
|
|
|
5a5df48 |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
5a5df48 |
Date: Fri, 7 Nov 2014 14:48:21 +0100
|
|
|
39fddbe |
Subject: [PATCH 2/2] Update to Maven 3.2.3
|
|
|
5a5df48 |
|
|
|
5a5df48 |
---
|
|
|
5a5df48 |
pom.xml | 2 +-
|
|
|
5a5df48 |
.../org/eclipse/aether/internal/ant/AntModelResolver.java | 15 ++++++++++++++-
|
|
|
5a5df48 |
2 files changed, 15 insertions(+), 2 deletions(-)
|
|
|
5a5df48 |
|
|
|
5a5df48 |
diff --git a/pom.xml b/pom.xml
|
|
|
39fddbe |
index 7d22ca6..18ce0d3 100644
|
|
|
5a5df48 |
--- a/pom.xml
|
|
|
5a5df48 |
+++ b/pom.xml
|
|
|
39fddbe |
@@ -117,7 +117,7 @@
|
|
|
5a5df48 |
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
|
|
|
5a5df48 |
<sonatypeOssDistMgmtSnapshotsId>sonatype-nexus-snapshots</sonatypeOssDistMgmtSnapshotsId>
|
|
|
5a5df48 |
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
|
|
|
5a5df48 |
- <mavenVersion>3.1.0</mavenVersion>
|
|
|
5a5df48 |
+ <mavenVersion>3.2.3</mavenVersion>
|
|
|
39fddbe |
<aetherVersion>1.0.1.v20141111</aetherVersion>
|
|
|
5a5df48 |
</properties>
|
|
|
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
|
|
|
5a5df48 |
index dc7ef72..e0d40c5 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
|
|
|
5a5df48 |
@@ -16,6 +16,7 @@ import java.util.HashSet;
|
|
|
5a5df48 |
import java.util.List;
|
|
|
5a5df48 |
import java.util.Set;
|
|
|
5a5df48 |
|
|
|
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;
|
|
|
5a5df48 |
@@ -77,7 +78,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 |
}
|
|
|
5a5df48 |
@@ -145,4 +152,10 @@ 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 |
+
|
|
|
5a5df48 |
}
|
|
|
5a5df48 |
--
|
|
|
39fddbe |
2.1.0
|
|
|
5a5df48 |
|