Repository: maven-resolver Updated Branches: refs/heads/ant-tasks 95cd7e2cc -> dcdf1da93
[MNG-6007] more renames from "aether" to "resolver" Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/dcdf1da9 Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/dcdf1da9 Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/dcdf1da9 Branch: refs/heads/ant-tasks Commit: dcdf1da9363217d3172252d88374958808cedd50 Parents: 95cd7e2 Author: Hervé Boutemy <[email protected]> Authored: Sun May 28 09:54:06 2017 +0200 Committer: Hervé Boutemy <[email protected]> Committed: Sun May 28 09:54:06 2017 +0200 ---------------------------------------------------------------------- README.md | 8 ++++---- build.xml | 2 +- .../java/org/apache/maven/resolver/internal/ant/Names.java | 4 ++-- src/test/resources/ant/Resolve/ant.xml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/dcdf1da9/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 6bb045b..bb228dc 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ The Maven Artifact Resolver Ant Tasks enable build scripts for [Apache Ant](http://ant.apache.org/) 1.7+ to use [Maven Artifact Resolver](/resolver/) combined to -[Apache Maven Aether Provider](/ref/current/maven-aether-provider/) to resolve dependencies +[Apache Maven Artifact Resolver Provider](/ref/current/maven-resolver-provider/) to resolve dependencies and install and deploy locally built artifacts. To integrate the tasks into your build file, copy the JAR into your project's lib directory and use the following snippet to load it: - <project xmlns:aether="antlib:org.apache.maven.resolver.ant" ...> + <project xmlns:resolver="antlib:org.apache.maven.resolver.ant" ...> <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml"> <classpath> <fileset dir="lib" includes="maven-resolver-ant-tasks-*.jar"/> @@ -93,7 +93,7 @@ remote repository: To suppress any network activity and only use already cached artifacts/metadata, you can use a boolean property: - <property name="aether.offline" value="true"/> + <property name="resolver.offline" value="true"/> ## Project @@ -184,7 +184,7 @@ You need to set a POM that references a file for the deploy task to work, as tha The `<resolve>`-task is used to collect and resolve dependencies from remote servers. If no repositories are set explicitly for the task, the repositories -referenced by "aether.repositories" are used. This contains only central by +referenced by "resolver.repositories" are used. This contains only central by default, but can be overridden by supplying another repository definition with this id. http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/dcdf1da9/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 0bb6270..86c441f 100644 --- a/build.xml +++ b/build.xml @@ -40,7 +40,7 @@ <resolver:remoterepo id="ossrh" url="http://oss.sonatype.org/content/groups/staging"; type="default" releases="true" snapshots="true" updates="daily" checksums="fail"/> - <resolver:remoterepos id="aether.repositories"> + <resolver:remoterepos id="resolver.repositories"> <resolver:remoterepo refid="central"/> <resolver:remoterepo refid="ossrh"/> </resolver:remoterepos> http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/dcdf1da9/src/main/java/org/apache/maven/resolver/internal/ant/Names.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/Names.java b/src/main/java/org/apache/maven/resolver/internal/ant/Names.java index 3250376..122bafa 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/Names.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/Names.java @@ -29,7 +29,7 @@ public final class Names // hide constructor } - public static final String ID = "aether"; + public static final String ID = "resolver"; public static final String ID_DEFAULT_REPOS = ID + ".repositories"; @@ -37,7 +37,7 @@ public final class Names public static final String ID_CENTRAL = "central"; - public static final String PROPERTY_OFFLINE = "aether.offline"; + public static final String PROPERTY_OFFLINE = ID + ".offline"; public static final String SETTINGS_XML = "settings.xml"; http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/dcdf1da9/src/test/resources/ant/Resolve/ant.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Resolve/ant.xml b/src/test/resources/ant/Resolve/ant.xml index eb6a1c7..4565ea7 100644 --- a/src/test/resources/ant/Resolve/ant.xml +++ b/src/test/resources/ant/Resolve/ant.xml @@ -28,7 +28,7 @@ &common; <repo:remoterepo id="remote" url="http://repo1.maven.org/maven2"; type="default" releases="true" snapshots="true" updates="always" checksums="fail"/> - <repo:remoterepos id="aether.repositories"> + <repo:remoterepos id="resolver.repositories"> <repo:remoterepo refid="remote"/> </repo:remoterepos>
