Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2D921200D34 for ; Fri, 20 Oct 2017 07:17:48 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2BD87160BED; Fri, 20 Oct 2017 05:17:48 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 78B55160BEC for ; Fri, 20 Oct 2017 07:17:47 +0200 (CEST) Received: (qmail 90291 invoked by uid 500); 20 Oct 2017 05:17:46 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 90281 invoked by uid 99); 20 Oct 2017 05:17:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Oct 2017 05:17:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 612DBDF9F1; Fri, 20 Oct 2017 05:17:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gintas@apache.org To: notifications@ant.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ant-ivy git commit: IVY-1420 document current implementation Date: Fri, 20 Oct 2017 05:17:46 +0000 (UTC) archived-at: Fri, 20 Oct 2017 05:17:48 -0000 Repository: ant-ivy Updated Branches: refs/heads/master 6b610aa41 -> 744c31824 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/744c3182 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/744c3182 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/744c3182 Branch: refs/heads/master Commit: 744c3182447b7091e8470268dce840bc98819e15 Parents: 6b610aa Author: Gintas Grigelionis Authored: Fri Oct 20 07:15:18 2017 +0200 Committer: Gintas Grigelionis Committed: Fri Oct 20 07:17:13 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/744c3182/asciidoc/ivyfile/configurations.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/ivyfile/configurations.adoc b/asciidoc/ivyfile/configurations.adoc index a5a5aec..3b074c2 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`. 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/744c3182/asciidoc/ivyfile/dependencies.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/ivyfile/dependencies.adoc b/asciidoc/ivyfile/dependencies.adoc index b5cad07..e36723d 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 and override attributes inherited from `configurations`. == Attributes http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/744c3182/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%"]