Repository: ant-ivy Updated Branches: refs/heads/master f0e8d41fc -> 66da0319a
use âMaven 2â consistently This closes #56 PR at github/apache/ant-ivy Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/66da0319 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/66da0319 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/66da0319 Branch: refs/heads/master Commit: 66da0319a09e9eea46473f4ac89c697bfdaf6ba6 Parents: f0e8d41 Author: twogee <[email protected]> Authored: Thu Jul 27 21:32:14 2017 +0200 Committer: Jaikiran Pai <[email protected]> Committed: Fri Jul 28 08:41:42 2017 +0530 ---------------------------------------------------------------------- asciidoc/resolver/filesystem.adoc | 4 ++-- asciidoc/resolver/ibiblio.adoc | 6 +++--- asciidoc/resolver/mirrored.adoc | 2 +- asciidoc/resolver/packager.adoc | 8 ++++---- asciidoc/resolver/url.adoc | 2 +- asciidoc/settings/namespaces.adoc | 4 ++-- asciidoc/settings/parsers.adoc | 2 +- asciidoc/standalone.adoc | 2 +- asciidoc/tutorial/build-repository.adoc | 8 ++++---- 9 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/66da0319/asciidoc/resolver/filesystem.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/filesystem.adoc b/asciidoc/resolver/filesystem.adoc index 6887aa0..aaca9a0 100644 --- a/asciidoc/resolver/filesystem.adoc +++ b/asciidoc/resolver/filesystem.adoc @@ -31,7 +31,7 @@ This resolver uses the file system to resolve ivy files and artifacts. An advant The configuration of such a resolver is mainly done through ivy and artifact patterns, indicating where ivy files and artifacts can be found in the file system. These patterns must be absolute paths (*__since 2.0__*). You can indicate a list of patterns which will be checked one after the other. -*__since 1.3__* Using the `m2compatible` attribute, this resolver will convert dots found in organisation into slashes like maven2 does for groupId. For instance, it will transform the organisation from `com.company` into `com/company` when replacing the token `[organisation]` in your pattern. +*__since 1.3__* Using the `m2compatible` attribute, this resolver will convert dots found in organisation into slashes like Maven 2 does for groupId. For instance, it will transform the organisation from `com.company` into `com/company` when replacing the token `[organisation]` in your pattern. *Limitation*: in `m2compatible` mode, this resolver is not able list available organizations. It means some features like link:../use/repreport.html[repreport] are not available. @@ -73,7 +73,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute [options="header",cols="15%,50%,35%"] |======= |Attribute|Description|Required -|m2compatible|True if this resolver should be maven2 compatible, false otherwise *__since 1.3__*|No, defaults to false +|m2compatible|True if this resolver should be Maven 2 compatible, false otherwise *__since 1.3__*|No, defaults to false |local|True if this resolver should be considered local, false otherwise *__since 1.4__*. See useOrigin attribute on the link:../settings/caches.html[caches] element for details.|No, defaults to true |transactional|true to force the use of transaction, false to prevent the use of transaction, auto to get transaction when possible *__since 2.0__*. See above for details.|No, defaults to auto |======= http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/66da0319/asciidoc/resolver/ibiblio.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/ibiblio.adoc b/asciidoc/resolver/ibiblio.adoc index 4dd4ed0..9a0aea4 100644 --- a/asciidoc/resolver/ibiblio.adoc +++ b/asciidoc/resolver/ibiblio.adoc @@ -29,7 +29,7 @@ This resolver usually uses ibiblio to find artifacts. -*__since 1.3__* Using the `m2compatible` attribute, you can benefit from Maven2 repository compatibility (convert dots in organisation into slashes, search for poms, use transitive dependencies of poms). This setting also affects the default place where the resolver looks for its artifacts to point to the Maven2 repository. So setting this attribute to `true` is sufficient to use Maven2 ibiblio repository. +*__since 1.3__* Using the `m2compatible` attribute, you can benefit from Maven 2 repository compatibility (convert dots in organisation into slashes, search for poms, use transitive dependencies of poms). This setting also affects the default place where the resolver looks for its artifacts to point to the Maven 2 repository. So setting this attribute to `true` is sufficient to use Maven 2 ibiblio repository. *__since 1.4__* When using the `m2compatible` flag, you can disable the use of poms by setting the usepoms flag to `false`. It is then roughly equivalent to a url resolver configured like this: @@ -56,7 +56,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute |Attribute|Description|Required |root|the root of the artifacts repository.|No, defaults to ${ivy.ibiblio.default.artifact.root} |pattern|a pattern describing the layout of the artifacts repository.|No, defaults to ${ivy.ibiblio.default.artifact.pattern} -|m2compatible|True if this resolver should be maven2 compatible, false otherwise *__since 1.3__*|No, defaults to false +|m2compatible|True if this resolver should be Maven 2 compatible, false otherwise *__since 1.3__*|No, defaults to false |usepoms|True if this resolver should use maven poms when it is already in m2compatible mode, false otherwise *__since 1.4__*|No, defaults to true |useMavenMetadata|True if this resolver should use maven-metadata.xml files to list available revisions, false to use directory listing *__since 2.0__*|No, defaults to true |======= @@ -73,7 +73,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute ---- -Defines a resolver called `maven2` using the Maven2 public repository to find module metadata (using maven 2 poms) and artifacts. +Defines a resolver called `maven2` using the Maven 2 public repository to find module metadata (using Maven 2 poms) and artifacts. ''' http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/66da0319/asciidoc/resolver/mirrored.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/mirrored.adoc b/asciidoc/resolver/mirrored.adoc index 129ad59..858847a 100644 --- a/asciidoc/resolver/mirrored.adoc +++ b/asciidoc/resolver/mirrored.adoc @@ -39,7 +39,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute [options="header",cols="15%,50%,35%"] |======= |Attribute|Description|Required -|m2compatible|True if this resolver should be maven2 compatible, false otherwise|No, defaults to false +|m2compatible|True if this resolver should be Maven 2 compatible, false otherwise|No, defaults to false |mirrorListUrl|The url where to retrieve the list of mirror urls.|Yes |======= http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/66da0319/asciidoc/resolver/packager.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/packager.adoc b/asciidoc/resolver/packager.adoc index b4e4c0d..87568a1 100644 --- a/asciidoc/resolver/packager.adoc +++ b/asciidoc/resolver/packager.adoc @@ -207,7 +207,7 @@ The packager.xml document element can contain the following child tags. |Element|Description|Cardinality |property|Set an ant property|0..n |resource|Define a resource to download and (optionally) unpack|0..n -|m2resource|Define a Maven2 resource to download and (optionally) unpack|0..n +|m2resource|Define a Maven 2 resource to download and (optionally) unpack|0..n |build|Specify ant tasks that ultimately result in each artifact being placed into artifacts/[type]s/[artifact].[ext]|0..1 |======= @@ -244,9 +244,9 @@ The resource XML tag supports the following attributes: The resource XML tag may contain child elements. An url tag with an href attribute specifies an alternate URL for the resource (see TestNG example above). Any other tags will be included as children of an automatically generated fileset tag. -== Maven2 Resources +== Maven 2 Resources -Special support is included for maven2 resources. For these resources, use the m2resource tag instead of the resource tag. Each m2resource tag specifies one or more artifacts that are downloaded from the Maven2 repository. +Special support is included for Maven 2 resources. For these resources, use the m2resource tag instead of the resource tag. Each m2resource tag specifies one or more artifacts that are downloaded from the Maven 2 repository. == M2Resource XML Elements @@ -285,7 +285,7 @@ The artifact children of m2resource tags support the following attributes: -Below is an example of packaging instructions for the link:http://commons.apache.org/email/[Apache Commons Email] module. Note that no build tag is required because all of the maven2 artifacts are usable directly (i.e., without unpacking anything). +Below is an example of packaging instructions for the link:http://commons.apache.org/email/[Apache Commons Email] module. Note that no build tag is required because all of the Maven 2 artifacts are usable directly (i.e., without unpacking anything). [source] ---- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/66da0319/asciidoc/resolver/url.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/resolver/url.adoc b/asciidoc/resolver/url.adoc index 62965a1..ff40f63 100644 --- a/asciidoc/resolver/url.adoc +++ b/asciidoc/resolver/url.adoc @@ -39,7 +39,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute [options="header",cols="15%,50%,35%"] |======= |Attribute|Description|Required -|m2compatible|True if this resolver should be maven2 compatible, false otherwise *__since 1.3__*|No, defaults to false +|m2compatible|True if this resolver should be Maven 2 compatible, false otherwise *__since 1.3__*|No, defaults to false |======= http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/66da0319/asciidoc/settings/namespaces.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/settings/namespaces.adoc b/asciidoc/settings/namespaces.adoc index a872a02..d71daf3 100644 --- a/asciidoc/settings/namespaces.adoc +++ b/asciidoc/settings/namespaces.adoc @@ -23,9 +23,9 @@ Namespaces are an advanced feature of Ivy which let you use resolvers in which module names and organisations are not consistent between each other. -For instance, if you want to use both a Maven2 repository and an ivyrep, you will face some naming issues. For example, all apache commons projects are declared to be part of the organisation __apache__ in ivyrep whereas in maven2 ibiblio repository, their organisation is same as the module. +For instance, if you want to use both a Maven 2 repository and an ivyrep, you will face some naming issues. For example, all Apache Commons projects are declared to be part of the organisation __apache__ in ivyrep whereas in Maven 2 ibiblio repository, their organisation is same as the module. -So if you try to use both maven2 and ivyrep repositories, you will face some issues like: +So if you try to use both Maven 2 and ivyrep repositories, you will face some issues like: [quote] _______ How do I declare a dependency on commons-lang? http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/66da0319/asciidoc/settings/parsers.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/settings/parsers.adoc b/asciidoc/settings/parsers.adoc index ce07ba6..a0ec4c7 100644 --- a/asciidoc/settings/parsers.adoc +++ b/asciidoc/settings/parsers.adoc @@ -33,7 +33,7 @@ Two parsers are available by default and thus do not need to be declared in this this is the parser used for ivy xml files. This parser is used for resources that aren't accepted by any other parser. * pom parser + -this parser is able to parse Maven2 `pom` files +this parser is able to parse Maven 2 `pom` files == Child elements http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/66da0319/asciidoc/standalone.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/standalone.adoc b/asciidoc/standalone.adoc index cc5abe0..9ed1a2f 100644 --- a/asciidoc/standalone.adoc +++ b/asciidoc/standalone.adoc @@ -37,7 +37,7 @@ usage: ivy -settings <settingsfile> use given file for settings -cache <cachedir> use given directory for cache -novalidate do not validate ivy files against xsd - -m2compatible use maven2 compatibility + -m2compatible use Maven 2 compatibility ==== resolve options -ivy <ivyfile> use given file as ivy file http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/66da0319/asciidoc/tutorial/build-repository.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/tutorial/build-repository.adoc b/asciidoc/tutorial/build-repository.adoc index 4f29860..e35aca9 100644 --- a/asciidoc/tutorial/build-repository.adoc +++ b/asciidoc/tutorial/build-repository.adoc @@ -40,10 +40,10 @@ Main targets: clean-cache --> clean the cache clean-repo --> clean the destination repository - maven2 --> install module from maven 2 repository - maven2-deps --> install module from maven 2 repository with dependencies - maven2-namespace --> install module from maven 2 using namespaces - maven2-namespace-deps --> install module with dependencies from maven2 repo using namespaces + maven2 --> install module from Maven 2 repository + maven2-deps --> install module from Maven 2 repository with dependencies + maven2-namespace --> install module from Maven 2 using namespaces + maven2-namespace-deps --> install module with dependencies from Maven 2 repository using namespaces Default target: basic ----
