You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2017/05/26 21:51:00 UTC
maven-resolver git commit: updated to Maven Artifact Resolver 1.0.3
Repository: maven-resolver
Updated Branches:
refs/heads/ant-tasks 39e003d19 -> de16de5f7
updated to Maven Artifact Resolver 1.0.3
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/de16de5f
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/de16de5f
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/de16de5f
Branch: refs/heads/ant-tasks
Commit: de16de5f74fc189bd7abe15345f697371b942d99
Parents: 39e003d
Author: Hervé Boutemy <hb...@apache.org>
Authored: Fri May 26 23:50:57 2017 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Fri May 26 23:50:57 2017 +0200
----------------------------------------------------------------------
pom.xml | 61 ++++++++++----------
.../resolver/internal/ant/AntModelResolver.java | 23 ++++++++
2 files changed, 54 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/de16de5f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 75f9b08..85edc0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,9 +36,9 @@
<name>Maven Artifact Resolver Ant Tasks</name>
<description>
- Ant tasks handling Maven artifacts using Maven Artifact Resolver and Maven Resolver Provider.
+ Ant tasks handling Maven artifacts using Maven Artifact Resolver and Maven Artifact Resolver Provider.
</description>
- <url>http://maven.apache.org/resolver-ant-tasks/</url>
+ <url>https://maven.apache.org/resolver-ant-tasks/</url>
<inceptionYear>2010</inceptionYear>
<scm>
@@ -63,8 +63,9 @@
</distributionManagement>
<properties>
- <mavenVersion>3.1.0</mavenVersion>
- <aetherVersion>1.0.1.v20141111</aetherVersion>
+ <mavenVersion>3.5.0</mavenVersion>
+ <resolverVersion>1.0.3</resolverVersion>
+ <javaVersion>7</javaVersion>
<maven.site.path>resolver-archives/resolver-ant-tasks-LATEST</maven.site.path>
<checkstyle.violation.ignore>LineLength,MagicNumber</checkstyle.violation.ignore>
</properties>
@@ -74,7 +75,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>2.1</version>
+ <version>3.0.24</version>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
@@ -99,39 +100,39 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
+ <version>${resolverVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <version>${resolverVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-impl</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-impl</artifactId>
+ <version>${resolverVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-basic</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-connector-basic</artifactId>
+ <version>${resolverVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-transport-classpath</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-classpath</artifactId>
+ <version>${resolverVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-transport-file</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-file</artifactId>
+ <version>${resolverVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-transport-http</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-http</artifactId>
+ <version>${resolverVersion}</version>
</dependency>
<dependency>
<!-- This shuts off annoying warnings from slf4j-api -->
@@ -142,7 +143,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-aether-provider</artifactId>
+ <artifactId>maven-resolver-provider</artifactId>
<version>${mavenVersion}</version>
<exclusions>
<exclusion>
@@ -238,9 +239,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-test-util</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-test-util</artifactId>
+ <version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/de16de5f/src/main/java/org/apache/maven/resolver/internal/ant/AntModelResolver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntModelResolver.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntModelResolver.java
index 83311fb..43b64f7 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/AntModelResolver.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntModelResolver.java
@@ -25,6 +25,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.maven.model.Dependency;
+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;
@@ -154,4 +156,25 @@ class AntModelResolver
return new FileModelSource( pomFile );
}
+ @Override
+ public ModelSource resolveModel( Parent parent )
+ throws UnresolvableModelException
+ {
+ return resolveModel( parent.getGroupId(), parent.getArtifactId(), parent.getVersion() );
+ }
+
+ @Override
+ public ModelSource resolveModel( Dependency dependency )
+ throws UnresolvableModelException
+ {
+ return resolveModel( dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() );
+ }
+
+ @Override
+ public void addRepository( Repository repository, boolean replace )
+ throws InvalidRepositoryException
+ {
+ addRepository( repository );
+ }
+
}