Modified: ant/site/ivy/production/history/master/ivyfile/dependencies.html URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/dependencies.html?rev=1829791&r1=1829790&r2=1829791&view=diff ============================================================================== --- ant/site/ivy/production/history/master/ivyfile/dependencies.html (original) +++ ant/site/ivy/production/history/master/ivyfile/dependencies.html Sun Apr 22 17:19:39 2018 @@ -1,6 +1,6 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>dependencies | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); -hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> > <a href="reference.html" class="current">Reference</a> > <a href="ivyfile.htm l" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> -<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>dependencies | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); +hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-rc2-local-20180419193918)</a> > <a href="reference.html" class="current">Reference</a> > <a href="ivyf ile.html" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> +<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-rc2-local-20180419193918)</a><ul class="open"><ul id="treemenu" class="treeview"> <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li> <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview"> <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li> @@ -213,20 +213,25 @@ hljs.initHighlightingOnLoad();</script>< <p><strong>Tag:</strong> dependencies <strong>Parent:</strong> <a href="../ivyfile.html">ivy-module</a></p> </div> <div class="paragraph"> -<p>Container for dependency elements, used to describe the dependencies of this module. -If this container is not present, it is assumed that the module has no dependency at all.</p> +<p>Container for dependency elements, used to describe the dependencies of this module. If this container is not present, it is assumed that the module has no dependencies at all.</p> </div> <div class="paragraph"> -<p>This container provides two similar behaviors described below. (See <a href="../ivyfile/configurations.html">configurations doc page</a> for more details about these behaviors).</p> +<p>This container provides two similar behaviors described below. (See <a href="configurations.html">configurations doc page</a> for more details about these behaviors).</p> </div> <div class="paragraph"> -<p><strong><em>since 1.1</em></strong> <code>defaultconf</code> defines the <code>conf</code> attribute to use when no conf is defined for a dependency in this Ivy file. It is only used when no conf mapping is defined, and has no influence in other cases.</p> +<p>(<strong><em>since 1.1</em></strong>) <code>defaultconf</code> defines the <code>conf</code> attribute to use when no conf is defined for a dependency in this Ivy file. It is only used when no conf mapping is defined, and has no influence in other cases.</p> </div> <div class="paragraph"> -<p><strong><em>since 1.3</em></strong> <code>defaultconfmapping</code> influences the way that a conf mapping with no mapped conf is interpreted.</p> +<p>(<strong><em>since 1.3</em></strong>) <code>defaultconfmapping</code> influences the way that a conf mapping with no mapped conf is interpreted.</p> </div> <div class="paragraph"> -<p>In Ivy 2.1.0 and earlier, if both <code>defaultconf</code> and <code>defaultconfmapping</code> are defined, it’s the <code>defaultconfmapping</code> that is used. Since Ivy 2.2.0, these attributes can be used together.</p> +<p>(<strong><em>since 2.2</em></strong>) Attributes <code>defaultconf</code> and <code>defaultconfmapping</code> can be used together. In earlier versions, if both <code>defaultconf</code> and <code>defaultconfmapping</code> are defined, it’s the <code>defaultconfmapping</code> that is used.</p> +</div> +<div class="paragraph"> +<p>(<strong><em>since 1.4</em></strong>) You can activate a <code>confmappingoverride</code> mode for all configurations, in which case the extending configurations will override the mappings of the configurations they extend from.</p> +</div> +<div class="paragraph"> +<p>(<strong><em>since 2.5</em></strong>) Attributes inherited via <a href="extends.html"><code>extends</code></a> are added to <code>dependencies</code> only on <a href="../use/deliver.html">delivery</a> and override attributes inherited from <code>configurations</code>.</p> </div> <div class="sect1"> <h2 id="_attributes">Attributes</h2> @@ -247,14 +252,19 @@ If this container is not present, it is <tbody> <tr> <td class="tableblock halign-left valign-top"><p class="tableblock">defaultconf</p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">the default configuration to use when none is specified in a dependency. <strong><em>since 1.1</em></strong></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">the default configuration to use when none is specified in a dependency. (<strong><em>since 1.1</em></strong>)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to <code>*->*</code></p></td> </tr> <tr> <td class="tableblock halign-left valign-top"><p class="tableblock">defaultconfmapping</p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">the default configuration mapping to use in this Ivy file. <strong><em>since 1.3</em></strong></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">the default configuration mapping to use in this Ivy file. (<strong><em>since 1.3</em></strong>)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to no default conf mapping</p></td> </tr> +<tr> +<td class="tableblock halign-left valign-top"><p class="tableblock">confmappingoverride</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code> to activate configuration mapping override, <code>false</code> otherwise. (<strong><em>since 1.4</em></strong>)</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to <code>false</code></p></td> +</tr> </tbody> </table> </div> @@ -263,7 +273,7 @@ If this container is not present, it is <h2 id="_child_elements">Child elements</h2> <div class="sectionbody"> <div class="paragraph"> -<p>Note: as specified by the ivy.xsd, the children elements are ordered; first must come the <code><a href="../ivyfile/dependency.html">dependency</a></code> elements, then the <code><a href="../ivyfile/exclude.html">exclude</a></code> elements, then the <code><a href="../ivyfile/override.html">override</a></code> elements, and then the <code><a href="../ivyfile/conflict.html">conflict</a></code> elements.</p> +<p>Note: as specified by the ivy.xsd, the children elements are ordered; first must come the <code><a href="dependency.html">dependency</a></code> elements, then the <code><a href="exclude.html">exclude</a></code> elements, then the <code><a href="override.html">override</a></code> elements, and then the <code><a href="conflict.html">conflict</a></code> elements.</p> </div> <table class="tableblock frame-all grid-all spread"> <colgroup> @@ -280,26 +290,26 @@ If this container is not present, it is </thead> <tbody> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../ivyfile/dependency.html">dependency</a></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="dependency.html">dependency</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">declares a dependency for this module</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">0..n</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../ivyfile/exclude.html">exclude</a></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">excludes artifacts, modules or whole organizations from the set of dependencies of this module <strong><em>since 2.0</em></strong></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="exclude.html">exclude</a></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">excludes artifacts, modules or whole organizations from the set of dependencies of this module (<strong><em>since 2.0</em></strong>)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">0..n</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../ivyfile/override.html">override</a></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">specifies an override mediation rule, overriding the revision and/or branch requested for a transitive dependency <strong><em>since 2.0</em></strong></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="override.html">override</a></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">specifies an override mediation rule, overriding the revision and/or branch requested for a transitive dependency (<strong><em>since 2.0</em></strong>)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">0..n</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../ivyfile/conflict.html">conflict</a></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">specifies a conflict manager for one or several dependencies <strong><em>since 2.0</em></strong></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="conflict.html">conflict</a></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">specifies a conflict manager for one or several dependencies (<strong><em>since 2.0</em></strong>)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">0..n</p></td> </tr> </tbody> </table> </div> -</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2017 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file +</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2018 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file
Modified: ant/site/ivy/production/history/master/ivyfile/dependency-artifact-conf.html URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/dependency-artifact-conf.html?rev=1829791&r1=1829790&r2=1829791&view=diff ============================================================================== --- ant/site/ivy/production/history/master/ivyfile/dependency-artifact-conf.html (original) +++ ant/site/ivy/production/history/master/ivyfile/dependency-artifact-conf.html Sun Apr 22 17:19:39 2018 @@ -1,6 +1,6 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>conf | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); -hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> > <a href="reference.html" class="current">Reference</a> > <a href="ivyfile. html" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a> > <a href="../ivyfile/dependency.html" class="current">dependency</a> > <a href="../ivyfile/dependency-artifact.html" class="current">artifact</a> > <a href="../ivyfile/dependency-artifact-conf.html" class="current">conf</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> -<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>conf | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); +hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-rc2-local-20180419193918)</a> > <a href="reference.html" class="current">Reference</a> > <a href="i vyfile.html" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a> > <a href="../ivyfile/dependency.html" class="current">dependency</a> > <a href="../ivyfile/dependency-artifact.html" class="current">artifact</a> > <a href="../ivyfile/dependency-artifact-conf.html" class="current">conf</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> +<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-rc2-local-20180419193918)</a><ul class="open"><ul id="treemenu" class="treeview"> <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li> <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview"> <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li> @@ -240,4 +240,4 @@ hljs.initHighlightingOnLoad();</script>< </tbody> </table> </div> -</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2017 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file +</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2018 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file Modified: ant/site/ivy/production/history/master/ivyfile/dependency-artifact.html URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/dependency-artifact.html?rev=1829791&r1=1829790&r2=1829791&view=diff ============================================================================== --- ant/site/ivy/production/history/master/ivyfile/dependency-artifact.html (original) +++ ant/site/ivy/production/history/master/ivyfile/dependency-artifact.html Sun Apr 22 17:19:39 2018 @@ -1,6 +1,6 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>artifact | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); -hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> > <a href="reference.html" class="current">Reference</a> > <a href="ivyfile.h tml" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a> > <a href="../ivyfile/dependency.html" class="current">dependency</a> > <a href="../ivyfile/dependency-artifact.html" class="current">artifact</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> -<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>artifact | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); +hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-rc2-local-20180419193918)</a> > <a href="reference.html" class="current">Reference</a> > <a href="iv yfile.html" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a> > <a href="../ivyfile/dependency.html" class="current">dependency</a> > <a href="../ivyfile/dependency-artifact.html" class="current">artifact</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> +<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-rc2-local-20180419193918)</a><ul class="open"><ul id="treemenu" class="treeview"> <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li> <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview"> <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li> @@ -237,13 +237,13 @@ It enables to specify the artifacts requ </div> </div> <div class="paragraph"> -<p><strong><em>since 1.4</em></strong> It’s possible to indicate the URL at which the artifact can be found. This is not mandatory, and even not recommended with an enterprise repository. Note that Ivy will always look at the location where the artifact should be and only use the URL if it cannot be found at the standard location in the repository.</p> +<p>(<strong><em>since 1.4</em></strong>) It’s possible to indicate the URL at which the artifact can be found. This is not mandatory, and even not recommended with an enterprise repository. Note that Ivy will always look at the location where the artifact should be and only use the URL if it cannot be found at the standard location in the repository.</p> </div> <div class="paragraph"> -<p><strong><em>since 1.4</em></strong> This tag supports <a href="../concept.html#extra">extra attributes</a>.</p> +<p>(<strong><em>since 1.4</em></strong>) This tag supports <a href="../concept.html#extra">extra attributes</a>.</p> </div> <div class="paragraph"> -<p><strong><em>since 2.0</em></strong> This feature can also be used for modules having their own module descriptor, but which doesn’t declare an artifact you know that is published. Note that in this case artifacts declared to be published by the dependency will be ignored, so do not forget to include all artifacts you want.</p> +<p>(<strong><em>since 2.0</em></strong>) This feature can also be used for modules having their own module descriptor, but which doesn’t declare an artifact you know that is published. Note that in this case artifacts declared to be published by the dependency will be ignored, so do not forget to include all artifacts you want.</p> </div> <div class="sect1"> <h2 id="_attributes">Attributes</h2> @@ -285,7 +285,7 @@ It enables to specify the artifacts requ </tr> <tr> <td class="tableblock halign-left valign-top"><p class="tableblock">url</p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">an URL where this artifact can be found if it isn’t present at the standard location in the repository <strong><em>since 1.4</em></strong></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">an URL where this artifact can be found if it isn’t present at the standard location in the repository (<strong><em>since 1.4</em></strong>)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to no URL</p></td> </tr> </tbody> @@ -355,4 +355,4 @@ It enables to specify the artifacts requ <p>Declares a dependency on module bar for which all artifacts declared will be used (thanks to the <code>include</code> tag) plus an artifact <code>baz</code> of type <code>source</code> and ext <code>jar</code> (which is not declared in module bar module descriptor).</p> </div> </div> -</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2017 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file +</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2018 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file Modified: ant/site/ivy/production/history/master/ivyfile/dependency-conf.html URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/dependency-conf.html?rev=1829791&r1=1829790&r2=1829791&view=diff ============================================================================== --- ant/site/ivy/production/history/master/ivyfile/dependency-conf.html (original) +++ ant/site/ivy/production/history/master/ivyfile/dependency-conf.html Sun Apr 22 17:19:39 2018 @@ -1,6 +1,6 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>conf | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); -hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> > <a href="reference.html" class="current">Reference</a> > <a href="ivyfile.h tml" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a> > <a href="../ivyfile/dependency.html" class="current">dependency</a> > <a href="../ivyfile/dependency-conf.html" class="current">conf</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> -<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>conf | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); +hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-rc2-local-20180419193918)</a> > <a href="reference.html" class="current">Reference</a> > <a href="iv yfile.html" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a> > <a href="../ivyfile/dependency.html" class="current">dependency</a> > <a href="../ivyfile/dependency-conf.html" class="current">conf</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> +<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-rc2-local-20180419193918)</a><ul class="open"><ul id="treemenu" class="treeview"> <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li> <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview"> <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li> @@ -272,4 +272,4 @@ hljs.initHighlightingOnLoad();</script>< </tbody> </table> </div> -</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2017 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file +</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2018 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file Modified: ant/site/ivy/production/history/master/ivyfile/dependency-include-conf.html URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/dependency-include-conf.html?rev=1829791&r1=1829790&r2=1829791&view=diff ============================================================================== --- ant/site/ivy/production/history/master/ivyfile/dependency-include-conf.html (original) +++ ant/site/ivy/production/history/master/ivyfile/dependency-include-conf.html Sun Apr 22 17:19:39 2018 @@ -1,6 +1,6 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>conf | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); -hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> > <a href="reference.html" class="current">Reference</a> > <a href="ivyfile. html" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a> > <a href="../ivyfile/dependency.html" class="current">dependency</a> > <a href="../ivyfile/dependency-include.html" class="current">include</a> > <a href="../ivyfile/dependency-include-conf.html" class="current">conf</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> -<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>conf | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); +hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-rc2-local-20180419193918)</a> > <a href="reference.html" class="current">Reference</a> > <a href="i vyfile.html" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a> > <a href="../ivyfile/dependency.html" class="current">dependency</a> > <a href="../ivyfile/dependency-include.html" class="current">include</a> > <a href="../ivyfile/dependency-include-conf.html" class="current">conf</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> +<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-rc2-local-20180419193918)</a><ul class="open"><ul id="treemenu" class="treeview"> <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li> <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview"> <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li> @@ -240,4 +240,4 @@ hljs.initHighlightingOnLoad();</script>< </tbody> </table> </div> -</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2017 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file +</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2018 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file Modified: ant/site/ivy/production/history/master/ivyfile/dependency-include.html URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/dependency-include.html?rev=1829791&r1=1829790&r2=1829791&view=diff ============================================================================== --- ant/site/ivy/production/history/master/ivyfile/dependency-include.html (original) +++ ant/site/ivy/production/history/master/ivyfile/dependency-include.html Sun Apr 22 17:19:39 2018 @@ -1,6 +1,6 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>include | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); -hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> > <a href="reference.html" class="current">Reference</a> > <a href="ivyfile.h tml" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a> > <a href="../ivyfile/dependency.html" class="current">dependency</a> > <a href="../ivyfile/dependency-include.html" class="current">include</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> -<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";><!----><!-- Licensed to the Apache Software Foundation (ASF) under one--><!-- or more contributor license agreements. See the NOTICE file--><!-- distributed with this work for additional information--><!-- regarding copyright ownership. The ASF licenses this file--><!-- to you under the Apache License, Version 2.0 (the--><!-- "License"); you may not use this file except in compliance--><!-- with the License. You may obtain a copy of the License at--><!----><!-- http://www.apache.org/licenses/LICENSE-2.0--><!----><!-- Unless required by applicable law or agreed to in writing,--><!-- software distributed under the License is distributed on an--><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY--><!-- KIND, either express or implied. See the License for the--><!-- specific language governing permissions and limitations--><!-- under the L icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>include | Apache Ivy™ Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); +hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/"; title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/";>Apache™</a> > <a href="http://ant.apache.org/";>Apache Ant™</a> > <a href="http://ant.apache.org/ivy/";>Apache Ivy™</a> ><span class="breadCrumb"> <a href="index.html" class="current">Documentation (2.5.0-rc2-local-20180419193918)</a> > <a href="reference.html" class="current">Reference</a> > <a href="iv yfile.html" class="current">Ivy Files</a> > <a href="../ivyfile/dependencies.html" class="current">dependencies</a> > <a href="../ivyfile/dependency.html" class="current">dependency</a> > <a href="../ivyfile/dependency-include.html" class="current">include</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy™</div><div class="content"><ul id="treemenu" class="treeview"> +<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-rc2-local-20180419193918)</a><ul class="open"><ul id="treemenu" class="treeview"> <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li> <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview"> <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li> @@ -267,7 +267,7 @@ It enables to restrict the artifacts req </tr> <tr> <td class="tableblock halign-left valign-top"><p class="tableblock">matcher</p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">the <a href="../concept.html#matcher">matcher</a> to use to match the modules to include <strong><em>since 2.0</em></strong></p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">the <a href="../concept.html#matcher">matcher</a> to use to match the modules to include (<strong><em>since 2.0</em></strong>)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to <code>exactOrRegexp</code> in pre 1.3 Ivy files, and <code>exact</code> in 1.3 and superior</p></td> </tr> <tr> @@ -305,4 +305,4 @@ It enables to restrict the artifacts req </tbody> </table> </div> -</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2017 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file +</div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright © 2007 - 2018 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/";>Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html> \ No newline at end of file
