Repository: ant-ivy Updated Branches: refs/heads/master 744c31824 -> 2074889ec (forced update)
IVY-1420 document current implementation Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/2074889e Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/2074889e Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/2074889e Branch: refs/heads/master Commit: 2074889ec495e3864813cca5cf8e92a3bc0adaa6 Parents: 6b610aa Author: Gintas Grigelionis <[email protected]> Authored: Fri Oct 20 07:15:18 2017 +0200 Committer: Gintas Grigelionis <[email protected]> Committed: Sat Oct 21 18:53:20 2017 +0200 ---------------------------------------------------------------------- asciidoc/ivyfile/configurations.adoc | 2 +- asciidoc/ivyfile/dependencies.adoc | 2 +- asciidoc/ivyfile/include.adoc | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2074889e/asciidoc/ivyfile/configurations.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/ivyfile/configurations.adoc b/asciidoc/ivyfile/configurations.adoc index a5a5aec..88f6801 100644 --- a/asciidoc/ivyfile/configurations.adoc +++ b/asciidoc/ivyfile/configurations.adoc @@ -35,7 +35,7 @@ See link:#defaultconfmapping[examples below] to clarify the behavior of these tw (*__since 1.4__*) You can activate a `confmappingoverride` mode for all configurations, in which case the extending configurations will override the mappings of the configurations they extend from. -(*__since 2.5__*) Attributes inherited via link:extends.html[`extends`] are added to both `configurations` and `dependencies`. +(*__since 2.5__*) Attributes inherited via link:extends.html[`extends`] are added to both `configurations` and `dependencies` on link:../use/deliver.html[delivery]. If the latter element has attributes, their values override values of the corresponding attributes of the former element. == [[attributes]]Attributes http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2074889e/asciidoc/ivyfile/dependencies.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/ivyfile/dependencies.adoc b/asciidoc/ivyfile/dependencies.adoc index b5cad07..6d36a8f 100644 --- a/asciidoc/ivyfile/dependencies.adoc +++ b/asciidoc/ivyfile/dependencies.adoc @@ -31,7 +31,7 @@ This container provides two similar behaviors described below. (See link:configu (*__since 1.4__*) You can activate a `confmappingoverride` mode for all configurations, in which case the extending configurations will override the mappings of the configurations they extend from. -(*__since 2.5__*) Attributes inherited via link:extends.html[`extends`] are added to both `configurations` and `dependencies`. +(*__since 2.5__*) Attributes inherited via link:extends.html[`extends`] are added to `dependencies` only on link:../use/deliver.html[delivery] and override attributes inherited from `configurations`. == Attributes http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/2074889e/asciidoc/ivyfile/include.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/ivyfile/include.adoc b/asciidoc/ivyfile/include.adoc index 891532f..460f6ca 100644 --- a/asciidoc/ivyfile/include.adoc +++ b/asciidoc/ivyfile/include.adoc @@ -25,10 +25,12 @@ Include configurations specified in another file. The included file should have a `configurations` tag as root tag, which follow the same specification as the link:../ivyfile/configurations.html[configurations] tag of the Ivy file. -This means that it can contain conf declarations, other file inclusion, and also a `defaultconfmapping`. +This means that it can contain conf declarations, other file inclusions, and have link:configurations.html#attributes[attributes] controlling conf mapping. When delivering an Ivy file with such an inclusion, the included descriptor file is inlined, i.e. Ivy removes the dependency on the external file. +[*__since 2.5__*] Attributes inherited through included file are set on `dependencies` element due to the way module descriptor updater works currently. + == Attributes [options="header",cols="15%,50%,35%"]
