You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2017/07/02 14:57:24 UTC
[1/6] ant-ivy git commit: Check spelling; fix whitespace and links;
sort entries in .gitignore
Repository: ant-ivy
Updated Branches:
refs/heads/master 87cd5df6f -> ff49f0dd3
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/retrieve.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/retrieve.adoc b/asciidoc/use/retrieve.adoc
index 024c7fe..8aaf9ee 100644
--- a/asciidoc/use/retrieve.adoc
+++ b/asciidoc/use/retrieve.adoc
@@ -73,7 +73,7 @@ Available options are the same as for link:../use/resolve.html[resolve] when use
[source,xml]
----
-<ivy:retrieve />
+<ivy:retrieve/>
----
Retrieves dependencies using default parameters. This usually retrieves all the dependencies of the last resolve call to a lib directory.
@@ -104,7 +104,7 @@ Note that if a dependency is required in the two configurations, it will be copi
[source,xml]
----
-<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]" sync="true" />
+<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]" sync="true"/>
----
Same as before, but with synchronisation enabled.
@@ -159,7 +159,7 @@ lib
[source,xml]
----
-<ivy:retrieve pattern="${lib.dir}/[organisation]/[artifact]-[revision].[ext]" />
+<ivy:retrieve pattern="${lib.dir}/[organisation]/[artifact]-[revision].[ext]"/>
----
Retrieves all dependencies of the last resolve call to a lib directory. The `[organisation]` token will get the unmodified organisation value. The resulting lib dir could look like this:
@@ -176,7 +176,7 @@ lib
[source,xml]
----
-<ivy:retrieve pattern="${lib.dir}/[orgPath]/[artifact]-[revision].[ext]" />
+<ivy:retrieve pattern="${lib.dir}/[orgPath]/[artifact]-[revision].[ext]"/>
----
Retrieves all dependencies of the last resolve call to a lib directory. The `[orgPath]` token will get a tree structure. The resulting lib dir could look like this:
@@ -207,7 +207,7 @@ Resolves and retrieve the latest version of the module bar and its dependencies
----
<ivy:retrieve pattern="lib/[artifact]-[revision].[ext]">
<firstmatchmapper>
- <globmapper from="lib/*-SNAPSHOT.jar" to="lib/snapshots/*-SNAPSHOT.jar" />
+ <globmapper from="lib/*-SNAPSHOT.jar" to="lib/snapshots/*-SNAPSHOT.jar"/>
<globmapper from="lib/*" to="lib/releases/*"/>
</firstmatchmapper>
</ivy:retrieve>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/settings.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/settings.adoc b/asciidoc/use/settings.adoc
index b358d4c..4c98e07 100644
--- a/asciidoc/use/settings.adoc
+++ b/asciidoc/use/settings.adoc
@@ -27,7 +27,7 @@ Multiple settings can be defined in a build script. Every task can reference its
All Ivy variables set during the settings are available in the Ant project as long as they were not set in Ant before (Ant properties are immutable).
-Moreover, the variables are exposed under two names: the variable name, and the variable name suffixed by dot + the settings id.
+Moreover, the variables are exposed under two names: the variable name, and the variable name suffixed by dot + the settings id.
For instance, if you load a settings with the id `myid`, and define a variable `my.variable=my.value` in the Ivy settings, both `my.variable` and `my.variable.myid` will now be available as properties in Ant and equal to `my.value`. If you later load another settings with the id `yourid`, and in this settings assign the variable `my.variable` the value `your.value`, in the Ant project you will have:
[source,properties]
@@ -42,7 +42,7 @@ my.variable.yourid=your.value
[options="header",cols="15%,50%,35%"]
|=======
|Attribute|Description|Required
-|id|The settings id useable in the `settingsRef` attributes of the ivy task that needs a setting.|No, defaults to `ivy.instance`
+|id|The settings id usable in the `settingsRef` attributes of the ivy task that needs a setting.|No, defaults to `ivy.instance`
|file|path to the settings file to use
.2+.^|No. If a file is provided, url is ignored. If none are provided, then it attempts to find a file at `${ivy.settings.file}`, and if this file does not exist, it uses a link:../tutorial/defaultconf.html[default settings file]
|url|url of the settings file to use
@@ -69,7 +69,7 @@ A special attention should be applied when you have a multi-project build with `
[source,xml]
----
-<ivy:settings />
+<ivy:settings/>
----
Use either `${ivy.settings.file}` if it exists, or the link:../samples/ivysettings-default.xml[default settings file]
@@ -80,23 +80,23 @@ This simplest setting is implicit.
[source,xml]
----
-<ivy:settings file="mysettings.xml" />
+<ivy:settings file="mysettings.xml"/>
----
=== Configure with an url
[source,xml]
----
-<ivy:settings url="http://mysite.com/mysettings.xml" />
+<ivy:settings url="http://mysite.com/mysettings.xml"/>
----
-=== Configure multiple realms which require autentication
+=== Configure multiple realms which require authentication
[source,xml]
----
<ivy:settings file="path/to/my/ivysettings.xml">
- <credentials host="myhost.com" realm="My Realm" username="myuser" passwd="mypasswd" />
- <credentials host="yourhost.com" realm="Your Realm" username="myuser" passwd="myotherpasswd" />
+ <credentials host="myhost.com" realm="My Realm" username="myuser" passwd="mypasswd"/>
+ <credentials host="yourhost.com" realm="Your Realm" username="myuser" passwd="myotherpasswd"/>
</ivy:settings>
----
@@ -106,9 +106,9 @@ You can use multiple ivy settings during a build. Then every ivy task should spe
[source,xml]
----
- <ivy:settings id="ivy.normal.settings" file="normal_settings.xml" />
- <ivy:settings id="ivy.release.settings" file="release_settings.xml" />
+ <ivy:settings id="ivy.normal.settings" file="normal_settings.xml"/>
+ <ivy:settings id="ivy.release.settings" file="release_settings.xml"/>
- <ivy:resolve settingsRef="ivy.normal.settings" />
- <ivy:resolve settingsRef="ivy.release.settings" />
+ <ivy:resolve settingsRef="ivy.normal.settings"/>
+ <ivy:resolve settingsRef="ivy.release.settings"/>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/var.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/var.adoc b/asciidoc/use/var.adoc
index 61d20a3..7fc4e96 100644
--- a/asciidoc/use/var.adoc
+++ b/asciidoc/use/var.adoc
@@ -21,7 +21,7 @@ Sets a variable (by name and value), or set of variables (from file or url) in I
Variables are case sensitive.
-Contrary to ant properties, ivy variables are mutable. But a problem with this is that you do not control when
+Contrary to ant properties, ivy variables are mutable. But a problem with this is that you do not control when
variables are substituted, and usually it is done as soon as possible. So changing the value of a variable will
have no effect if it has already been substituted. Consequently, *using this task is NOT recommended*.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/yed.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/yed.adoc b/asciidoc/yed.adoc
index 095c7de..8c7c4e1 100644
--- a/asciidoc/yed.adoc
+++ b/asciidoc/yed.adoc
@@ -20,7 +20,7 @@
link:http://www.yworks.com/en/products_yed_about.htm[yEd] is a free graph editor, benefiting from
all the automatic layouts of yFiles. Ivy is able to generate graphs which are readable by yEd.
-The graphs generated by Ivy are not layed out (in fact it's why we use yEd), so you have to follow a simple sequence of steps to layout the generated graphs.
+The graphs generated by Ivy are not laid out (in fact it's why we use yEd), so you have to follow a simple sequence of steps to layout the generated graphs.
== Preparation
@@ -53,4 +53,4 @@ That's all, you should have obtained something like this:
image::images/yed-step7.jpg[]
Note that this is only one possibility, test the available layouts yourself, you could find one better in your case.
-Once you have layed out the graph, you can either save it with in the same file (but be warned that it will be overwritten at next ivy report call), or another file, export it to jpg, gif, svg, etc. (see link:http://www.yworks.com/en/products_yed_about.htm[yEd] site for details).
+Once you have laid out the graph, you can either save it with in the same file (but be warned that it will be overwritten at next ivy report call), or another file, export it to jpg, gif, svg, etc. (see link:http://www.yworks.com/en/products_yed_about.htm[yEd] site for details).
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/build-release.xml
----------------------------------------------------------------------
diff --git a/build-release.xml b/build-release.xml
index 84bd0e2..e01b122 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -17,10 +17,11 @@
under the License.
-->
<project name="IvyRelease" default="snapshot"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:ivy2="antlib:org.apache.ivy.ant_2"
- xmlns:asciidoctor="antlib:org.asciidoctor.ant"
- xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:ivy2="antlib:org.apache.ivy.ant_2"
+ xmlns:asciidoctor="antlib:org.asciidoctor.ant"
+ xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
+
<import file="build.xml"/>
<macrodef name="run-tutorial">
@@ -314,7 +315,7 @@
<zipfileset dir="${build.dir}/lib" prefix="${snapshot.full.name}/lib" excludes="ant-*.jar,bcpg-*.jar,bcprov*.jar"/>
</zip>
<tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.tar.gz"
- compression="gzip" longfile="gnu">
+ compression="gzip" longfile="gnu">
<zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip"/>
</tar>
</target>
@@ -336,14 +337,14 @@
<mapping conf="test" scope="test"/>
</ivy:makepom>
<copy file="${artifacts.build.dir}/jars/${final.name}"
- tofile="${m2.distrib.dir}/ivy-${build.version}.jar"/>
+ tofile="${m2.distrib.dir}/ivy-${build.version}.jar"/>
<!-- jar javadocs -->
<jar destfile="${m2.distrib.dir}/ivy-${build.version}-javadoc.jar">
<fileset dir="${javadoc.build.dir}"/>
</jar>
<!-- copy sources jar -->
<copy file="${artifacts.build.dir}/sources/${final.name}"
- tofile="${m2.distrib.dir}/ivy-${build.version}-sources.jar"/>
+ tofile="${m2.distrib.dir}/ivy-${build.version}-sources.jar"/>
<checksum algorithm="md5">
<fileset dir="${m2.distrib.dir}">
@@ -412,18 +413,18 @@
<ivy2:settings id="sign.settingsId" file="ivysettings-release.xml"/>
<ivy2:cachepath organisation="org.apache.commons" settingsRef="sign.settingsId" transitive="false" log="download-only"
- module="commons-openpgp" revision="1.0-SNAPSHOT" inline="true" pathid="openpgp.classpath"/>
+ module="commons-openpgp" revision="1.0-SNAPSHOT" inline="true" pathid="openpgp.classpath"/>
<ivy2:cachepath organisation="org.bouncycastle" settingsRef="sign.settingsId" log="download-only"
- module="bcprov-jdk16" revision="1.45" inline="true" pathid="bouncycastle.bcprov.classpath"/>
+ module="bcprov-jdk16" revision="1.45" inline="true" pathid="bouncycastle.bcprov.classpath"/>
<ivy2:cachepath organisation="org.bouncycastle" settingsRef="sign.settingsId" transitive="false" log="download-only"
- module="bcpg-jdk16" revision="1.45" inline="true" pathid="bouncycastle.bcpg.classpath"/>
+ module="bcpg-jdk16" revision="1.45" inline="true" pathid="bouncycastle.bcpg.classpath"/>
<!--
For some reason, if we use the openpgp:signer task here directly, the bouncycastle security
provider cannot be loaded. If we launch it as a forked process everything works fine !?!
-->
<java classname="org.apache.tools.ant.launch.Launcher"
- fork="true">
+ fork="true">
<classpath>
<fileset dir="${ant.home}" includes="**/*.jar"/>
<path refid="bouncycastle.bcprov.classpath"/>
@@ -535,10 +536,14 @@
</target>
<target name="prepare-snapshot"
- depends="/localivy, clean-ivy-home, clean, clean-lib, snapshot-version, install, clean-examples, test-report" />
+ depends="/localivy,clean-ivy-home,clean,clean-lib,snapshot-version,install,clean-examples,test-report"/>
+
<target name="snapshot"
depends="prepare-snapshot,snapshot-src,snapshot-bin,snapshot-maven2,snapshot-checksums"
description="used for nightly and integration builds"/>
- <target name="release" depends="release-version,/localivy,clean-ivy-home,clean,clean-lib,rat,snapshot" description="make a new release of Ivy"/>
+
+ <target name="release"
+ depends="release-version,/localivy,clean-ivy-home,clean,clean-lib,rat,snapshot"
+ description="make a new release of Ivy"/>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 5f35c06..834123f 100644
--- a/build.xml
+++ b/build.xml
@@ -39,7 +39,7 @@
<target name="init-ivy" depends="compile-bootstrap,init-ivy-home">
<taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant">
+ uri="antlib:org.apache.ivy.ant">
<classpath>
<pathelement location="${core.classes.build.dir}"/>
<pathelement location="${bootstrap.classes.build.dir}"/>
@@ -50,7 +50,7 @@
</target>
<target name="install" depends="jar"
- description="build Ivy and install it in Ivy user home for builds using Ivy user home to load Ivy jar">
+ description="build Ivy and install it in Ivy user home for builds using Ivy user home to load Ivy jar">
<property name="ivy.jar.file" value="${ivy.home}/jars/ivy.jar"/>
<copy file="${artifacts.build.dir}/jars/${final.name}" tofile="${ivy.jar.file}"/>
</target>
@@ -95,8 +95,6 @@
<include name="*.jar"/>
<exclude name="ant.jar"/>
<exclude name="ant-launcher.jar"/>
- <exclude name="ant-nodeps.jar"/>
- <exclude name="ant-trax.jar"/>
</fileset>
<pathelement location="${core.classes.build.dir}"/>
<pathelement location="${ant.classes.build.dir}"/>
@@ -185,13 +183,13 @@
</target>
<target name="compile-core" depends="prepare">
- <javac srcdir="${src.dir}"
- destdir="${core.classes.build.dir}"
- sourcepath=""
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- includeantruntime="no">
+ <javac srcdir="${src.dir}"
+ destdir="${core.classes.build.dir}"
+ sourcepath=""
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ includeantruntime="no">
<excludesfile name="ant.patterns"/>
<excludesfile name="optional.patterns"/>
</javac>
@@ -220,14 +218,14 @@
<!-- Build the Ant tasks with the current Ant runtime -->
<target name="compile-bootstrap" depends="compile-core">
- <javac srcdir="${src.dir}"
- destdir="${bootstrap.classes.build.dir}"
- sourcepath=""
- classpathref="build.bootstrap.classpath"
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- includeantruntime="yes">
+ <javac srcdir="${src.dir}"
+ destdir="${bootstrap.classes.build.dir}"
+ sourcepath=""
+ classpathref="build.bootstrap.classpath"
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ includeantruntime="yes">
<includesfile name="ant.patterns"/>
</javac>
<copy todir="${bootstrap.classes.build.dir}" includeEmptyDirs="false">
@@ -240,14 +238,14 @@
<!-- Build the Ant tasks with the minimal Ant runtime -->
<target name="compile-ant" depends="compile-core,resolve">
- <javac srcdir="${src.dir}"
- destdir="${ant.classes.build.dir}"
- sourcepath=""
- classpathref="build.ant.classpath"
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- includeantruntime="no">
+ <javac srcdir="${src.dir}"
+ destdir="${ant.classes.build.dir}"
+ sourcepath=""
+ classpathref="build.ant.classpath"
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ includeantruntime="no">
<includesfile name="ant.patterns"/>
</javac>
<copy todir="${ant.classes.build.dir}" includeEmptyDirs="false">
@@ -263,14 +261,14 @@
</target>
<target name="compile-optional" depends="compile-ant">
- <javac srcdir="${src.dir}"
- destdir="${optional.classes.build.dir}"
- sourcepath=""
- classpathref="build.optional.classpath"
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- includeantruntime="no">
+ <javac srcdir="${src.dir}"
+ destdir="${optional.classes.build.dir}"
+ sourcepath=""
+ classpathref="build.optional.classpath"
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ includeantruntime="no">
<includesfile name="optional.patterns"/>
<includesfile name="ant.patterns"/>
</javac>
@@ -310,7 +308,7 @@
</copy>
<jar destfile="${artifacts.build.dir}/jars/${final.name}"
- manifest="${artifacts.build.dir}/MANIFEST.MF">
+ manifest="${artifacts.build.dir}/MANIFEST.MF">
<metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
<manifest>
<attribute name="Specification-Title" value="Apache Ivy with Ant tasks"/>
@@ -346,14 +344,14 @@
TESTS
================================================================= -->
<target name="build-test" depends="jar">
- <javac srcdir="${test.dir}"
- destdir="${test.build.dir}"
- classpathref="run.classpath"
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- encoding="UTF-8"
- includeantruntime="no"/>
+ <javac srcdir="${test.dir}"
+ destdir="${test.build.dir}"
+ classpathref="run.classpath"
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ encoding="UTF-8"
+ includeantruntime="no"/>
<copy todir="${test.build.dir}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -363,15 +361,15 @@
<target name="build-custom-resolver-jar" depends="jar">
<mkdir dir="${build.dir}/custom-classpath"/>
- <javac srcdir="${basedir}/test/custom-classpath"
- destdir="${build.dir}/custom-classpath"
- classpathref="run.classpath"
- source="${ivy.minimum.javaversion}"
- target="${ivy.minimum.javaversion}"
- debug="${debug.mode}"
- includeantruntime="no"/>
- <jar destfile="${test.dir}/org/apache/ivy/core/settings/custom-resolver.jar"
- basedir="${build.dir}/custom-classpath"/>
+ <javac srcdir="${basedir}/test/custom-classpath"
+ destdir="${build.dir}/custom-classpath"
+ classpathref="run.classpath"
+ source="${ivy.minimum.javaversion}"
+ target="${ivy.minimum.javaversion}"
+ debug="${debug.mode}"
+ includeantruntime="no"/>
+ <jar destfile="${test.dir}/org/apache/ivy/core/settings/custom-resolver.jar"
+ basedir="${build.dir}/custom-classpath"/>
</target>
<target name="init-tests-offline" if="offline">
@@ -551,7 +549,7 @@
<target name="init-checkstyle" depends="jar">
<ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="7.8.1"
- inline="true" conf="default" pathid="checkstyle.classpath" log="download-only"/>
+ inline="true" conf="default" pathid="checkstyle.classpath" log="download-only"/>
<taskdef uri="antlib:com.puppycrawl.tools.checkstyle.ant"
resource="com/puppycrawl/tools/checkstyle/ant/antlib.xml" classpathref="checkstyle.classpath"/>
</target>
@@ -560,8 +558,8 @@
<target name="checkstyle-internal" depends="init-checkstyle">
<mkdir dir="${checkstyle.report.dir}"/>
<cs:checkstyle xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"
- config="${checkstyle.src.dir}/checkstyle-config"
- failOnViolation="false" failureProperty="checkstyle.failed">
+ config="${checkstyle.src.dir}/checkstyle-config"
+ failOnViolation="false" failureProperty="checkstyle.failed">
<classpath>
<path refid="run.classpath"/>
</classpath>
@@ -576,7 +574,7 @@
</target>
<target name="checkstyle" depends="checkstyle-internal"
- description="checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config">
+ description="checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config">
<fail if="checkstyle.failed"
message="Checkstyle has errors. See report in ${checkstyle.report.dir}"/>
</target>
@@ -584,8 +582,8 @@
<target name="checkstyle-report" depends="checkstyle-internal">
<property name="checkstyle.basedir" location="${src.dir}"/>
<xslt in="${checkstyle.report.dir}/checkstyle.xml"
- style="${checkstyle.src.dir}/checkstyle-frames.xsl"
- out="${checkstyle.report.dir}/output.txt">
+ style="${checkstyle.src.dir}/checkstyle-frames.xsl"
+ out="${checkstyle.report.dir}/output.txt">
<param name="basedir" expression="${checkstyle.basedir}"/>
<param name="output.dir" expression="${checkstyle.report.dir}"/>
</xslt>
[3/6] ant-ivy git commit: Check spelling; fix whitespace and links;
sort entries in .gitignore
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivysettings-default.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivysettings-default.xml b/asciidoc/samples/ivysettings-default.xml
index 9d985c1..3779c5c 100644
--- a/asciidoc/samples/ivysettings-default.xml
+++ b/asciidoc/samples/ivysettings-default.xml
@@ -14,7 +14,7 @@
"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 License.
+ under the License.
-->
<ivysettings>
<settings defaultResolver="ivyrep"/>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/jayasoft-ivyrep-example-default.html
----------------------------------------------------------------------
diff --git a/asciidoc/samples/jayasoft-ivyrep-example-default.html b/asciidoc/samples/jayasoft-ivyrep-example-default.html
index faa79ec..41668f3 100644
--- a/asciidoc/samples/jayasoft-ivyrep-example-default.html
+++ b/asciidoc/samples/jayasoft-ivyrep-example-default.html
@@ -14,7 +14,7 @@
"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 License.
+ under the License.
-->
<html>
@@ -32,12 +32,12 @@
<a href="http://ant.apache.org/ivy/"><img src="../images/logo.png"></a>
</div>
<h1>
-<a name="jayasoft-ivyrep-example"></a><span id="module">ivyrep-example</span>
- by
+<a name="jayasoft-ivyrep-example"></a><span id="module">ivyrep-example</span>
+ by
<span id="organisation">jayasoft</span>
</h1>
<div id="date">
- resolved on
+ resolved on
2005-04-08 13:33:40</div>
<ul id="confmenu">
<li>
@@ -51,14 +51,14 @@
<td class="title">Modules</td><td class="value">3</td>
</tr>
<tr>
-<td class="title">Revisions</td><td class="value">4
+<td class="title">Revisions</td><td class="value">4
(0 searched <img title="module revisions which required a search with a dependency resolver to be resolved" alt="searched" src="../images/searched.gif">,
0 downloaded <img title="module revisions for which ivy file was downloaded by dependency resolver" alt="downloaded" src="../images/downloaded.gif">,
1 evicted <img title="module revisions which were evicted by others" alt="evicted" src="../images/evicted.gif">,
0 errors <img title="module revisions on which error occurred" alt="error" src="../images/error.gif">)</td>
</tr>
<tr>
-<td class="title">Artifacts</td><td class="value">3
+<td class="title">Artifacts</td><td class="value">3
(0 downloaded,
0 failed)</td>
</tr>
@@ -281,7 +281,7 @@
0 kB in cache)</td>
</tr>
<tr>
-<td class="title">Evicted by</td><td class="value">2.0
+<td class="title">Evicted by</td><td class="value">2.0
in <b>latest-revision</b> conflict manager
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/standard-osgi/build.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/build.xml b/asciidoc/samples/standard-osgi/build.xml
index e4a9dc7..c8ac62b 100644
--- a/asciidoc/samples/standard-osgi/build.xml
+++ b/asciidoc/samples/standard-osgi/build.xml
@@ -14,70 +14,70 @@
"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 License.
+ under the License.
-->
<project name="standard-osgi" xmlns:ivy="ivy" xmlns:bnd="bnd">
<!-- Load Ivy ant tasks -->
- <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" />
- <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the folowing -->
+ <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml"/>
+ <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the following -->
<!-- taskdef rather than the above one -->
- <!--path id="ivy.classpath">
+ <!--path id="ivy.classpath">
<fileset dir="${basedir}">
- <include name="ivy.jar" />
+ <include name="ivy.jar"/>
</fileset>
</path>
<taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" classpathref="ivy.classpath" /-->
<!-- Load Bnd ant tasks -->
- <taskdef uri="bnd" resource="org/apache/ivy/ant/antlib.xml" />
- <!-- If Bnd is not in Ant's classpath, get the jar of Bnd and use the folowing -->
+ <taskdef uri="bnd" resource="org/apache/ivy/ant/antlib.xml"/>
+ <!-- If Bnd is not in Ant's classpath, get the jar of Bnd and use the following -->
<!-- taskdef rather than the above one -->
- <!--path id="bnd.classpath">
+ <!--path id="bnd.classpath">
<fileset dir="${basedir}">
- <include name="bnd.jar" />
+ <include name="bnd.jar"/>
</fileset>
</path>
<taskdef uri="bnd" resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" /-->
<target name="clean" description="Clean the build directory">
- <delete dir="${basedir}/target" />
+ <delete dir="${basedir}/target"/>
</target>
<target name="ivy:configure">
<!-- classical ivy configuration -->
- <ivy:configure file="${basedir}/ivysettings.xml" />
+ <ivy:configure file="${basedir}/ivysettings.xml"/>
</target>
<target name="ivy:resolve" depends="ivy:configure">
- <ivy:resolve file="ivy.xml" conf="*" />
- <ivy:cachepath pathid="compile.classpath" conf="default" useOrigin="true" />
+ <ivy:resolve file="ivy.xml" conf="*"/>
+ <ivy:cachepath pathid="compile.classpath" conf="default" useOrigin="true"/>
</target>
<target name="compile" depends="ivy:resolve" description="Compile the OSGi bundle">
- <mkdir dir="${basedir}/target/classes" />
+ <mkdir dir="${basedir}/target/classes"/>
<!-- simple javac (WARNING: contrary to the JDT, javac doesn't understand OSGi's accessibility (private packages)) -->
- <javac srcdir="${basedir}/src" classpathref="compile.classpath" destdir="${basedir}/target/classes" debug="true" includeAntRuntime="false" />
+ <javac srcdir="${basedir}/src" classpathref="compile.classpath" destdir="${basedir}/target/classes" debug="true" includeAntRuntime="false"/>
<copy todir="${basedir}/target/classes">
<fileset dir="${basedir}/src">
- <include name="**" />
- <exclude name="**/*.java" />
- <exclude name="**/package.html" />
+ <include name="**"/>
+ <exclude name="**/*.java"/>
+ <exclude name="**/package.html"/>
</fileset>
<fileset dir="${basedir}">
- <include name="plugin.xml" />
+ <include name="plugin.xml"/>
</fileset>
</copy>
</target>
<target name="generate-manifest" depends="ivy:resolve">
- <mkdir dir="META-INF" />
- <bnd:bnd classpath="${toString:compile.classpath}" sourcepath="${basedir}/src" eclipse="false" files="org.apache.ivy.sample.standard-osgi.bnd" />
+ <mkdir dir="META-INF"/>
+ <bnd:bnd classpath="${toString:compile.classpath}" sourcepath="${basedir}/src" eclipse="false" files="org.apache.ivy.sample.standard-osgi.bnd"/>
</target>
<target name="build" depends="compile,generate-manifest" description="Build the OSGi app">
<!-- simple jaring -->
- <jar basedir="${basedir}/target/classes" destfile="${basedir}/target/${ant.project.name}.jar" manifest="META-INF/MANIFEST.MF" />
+ <jar basedir="${basedir}/target/classes" destfile="${basedir}/target/${ant.project.name}.jar" manifest="META-INF/MANIFEST.MF"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/standard-osgi/ivy.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/ivy.xml b/asciidoc/samples/standard-osgi/ivy.xml
index ca6411e..158623a 100644
--- a/asciidoc/samples/standard-osgi/ivy.xml
+++ b/asciidoc/samples/standard-osgi/ivy.xml
@@ -14,11 +14,11 @@
"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 License.
+ under the License.
-->
<ivy-module version="2.0">
- <info organisation="com.acme" module="local-osgi-repo" />
+ <info organisation="com.acme" module="local-osgi-repo"/>
<dependencies>
- <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" />
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0"/>
</dependencies>
-</ivy-module>
\ No newline at end of file
+</ivy-module>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/standard-osgi/ivysettings.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/ivysettings.xml b/asciidoc/samples/standard-osgi/ivysettings.xml
index f5c476c..2411cfd 100644
--- a/asciidoc/samples/standard-osgi/ivysettings.xml
+++ b/asciidoc/samples/standard-osgi/ivysettings.xml
@@ -14,21 +14,21 @@
"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 License.
+ under the License.
-->
<ivysettings>
<!-- We need to define the Ivy Osgi latest strategy as the default one -->
- <settings defaultResolver="osgi-bundles" defaultLatestStrategy="latest-osgi" />
+ <settings defaultResolver="osgi-bundles" defaultLatestStrategy="latest-osgi"/>
<!-- These are usual cache setup -->
<caches resolutionCacheDir="${ivy.settings.dir}/cache/resolution" useOrigin="true">
- <cache name="osgi-bundles" basedir="${ivy.settings.dir}/cache/osgi-bundles" />
+ <cache name="osgi-bundles" basedir="${ivy.settings.dir}/cache/osgi-bundles"/>
</caches>
<!-- We just need to define our Ivy Osgi resolver -->
<resolvers>
- <obr name="osgi-bundles" repoXmlFile="${ivy.settings.dir}/../repo/repo.xml" />
+ <obr name="osgi-bundles" repoXmlFile="${ivy.settings.dir}/../repo/repo.xml"/>
</resolvers>
</ivysettings>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd b/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
index 8dbe365..4b7c7a4 100644
--- a/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
+++ b/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
@@ -1,18 +1,18 @@
-# ***************************************************************
-# * 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 License.
-# ***************************************************************
+# ***************************************************************
+# * 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 License.
+# ***************************************************************
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/target-platform/build.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/target-platform/build.xml b/asciidoc/samples/target-platform/build.xml
index 2de015a..0e0f1b5 100644
--- a/asciidoc/samples/target-platform/build.xml
+++ b/asciidoc/samples/target-platform/build.xml
@@ -14,43 +14,43 @@
"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 License.
+ under the License.
-->
<project name="target-platform" xmlns:ivy="ivy">
<!-- Load Ivy ant tasks -->
- <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" />
- <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the folowing -->
+ <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml"/>
+ <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the following -->
<!-- taskdef rather than the above one -->
- <!--path id="ivy.classpath">
+ <!--path id="ivy.classpath">
<fileset dir="${basedir}">
- <include name="ivy.jar" />
+ <include name="ivy.jar"/>
</fileset>
</path>
<taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" classpathref="ivy.classpath" /-->
<target name="update-dependencies" description="Update the dependencies">
- <ivy:configure file="${basedir}/ivysettings.xml" />
- <ivy:resolve file="ivy.xml" conf="*" />
- <ivy:fixdeps tofile="ivy-fixed.xml" />
+ <ivy:configure file="${basedir}/ivysettings.xml"/>
+ <ivy:resolve file="ivy.xml" conf="*"/>
+ <ivy:fixdeps tofile="ivy-fixed.xml"/>
</target>
<!--
- Two choices: either the jars stas in the cache, or they are retrive in a dedicated folder
- Having the bundle retrieved in a folder is helpfull to manage target platforms with the PDE of Eclipse
+ Two choices: either the jars stays in the cache, or they are retrieved in a dedicated folder
+ Having the bundle retrieved in a folder is helpful to manage target platforms with PDE
-->
<target name="generate-target-platform" description="Generate the obr.xml of the target platform">
- <ivy:configure file="${basedir}/ivysettings.xml" />
- <ivy:resolve file="ivy-fixed.xml" conf="*" />
- <ivy:buildobr out="obr.xml" />
+ <ivy:configure file="${basedir}/ivysettings.xml"/>
+ <ivy:resolve file="ivy-fixed.xml" conf="*"/>
+ <ivy:buildobr out="obr.xml"/>
</target>
<target name="generate-retrieved-target-platform" description="Generate the obr.xml of the retrieved target platform">
- <ivy:configure file="${basedir}/ivysettings.xml" />
- <ivy:resolve file="ivy-fixed.xml" conf="*" />
- <ivy:retrieve pattern="${basedir}/bundles/[type]s/[artifact]_[revision].[ext]" />
- <ivy:buildobr basedir="${basedir}/bundles" out="obr.xml" />
+ <ivy:configure file="${basedir}/ivysettings.xml"/>
+ <ivy:resolve file="ivy-fixed.xml" conf="*"/>
+ <ivy:retrieve pattern="${basedir}/bundles/[type]s/[artifact]_[revision].[ext]"/>
+ <ivy:buildobr basedir="${basedir}/bundles" out="obr.xml"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/target-platform/ivy.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/target-platform/ivy.xml b/asciidoc/samples/target-platform/ivy.xml
index 8b83950..fb6ff95 100644
--- a/asciidoc/samples/target-platform/ivy.xml
+++ b/asciidoc/samples/target-platform/ivy.xml
@@ -14,11 +14,11 @@
"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 License.
+ under the License.
-->
<ivy-module version="2.0">
- <info organisation="com.acme" module="target-platform" />
+ <info organisation="com.acme" module="target-platform"/>
<dependencies>
- <dependency org="bundle" name="org.eclipse.jdt.core" rev="3.8.3.v20130121-145325" />
+ <dependency org="bundle" name="org.eclipse.jdt.core" rev="3.8.3.v20130121-145325"/>
</dependencies>
-</ivy-module>
\ No newline at end of file
+</ivy-module>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/target-platform/ivysettings.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/target-platform/ivysettings.xml b/asciidoc/samples/target-platform/ivysettings.xml
index 9697b93..db2cde6 100644
--- a/asciidoc/samples/target-platform/ivysettings.xml
+++ b/asciidoc/samples/target-platform/ivysettings.xml
@@ -14,20 +14,20 @@
"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 License.
+ under the License.
-->
<ivysettings>
- <settings defaultResolver="eclipse-juno" defaultLatestStrategy="latest-osgi" />
+ <settings defaultResolver="eclipse-juno" defaultLatestStrategy="latest-osgi"/>
<!-- These are usual cache setup -->
<caches resolutionCacheDir="${ivy.settings.dir}/cache/resolution" useOrigin="true">
- <cache name="eclipse-juno" basedir="${ivy.settings.dir}/cache/eclipse-juno" />
+ <cache name="eclipse-juno" basedir="${ivy.settings.dir}/cache/eclipse-juno"/>
</caches>
<!-- The resolvers from which we will find our bundles -->
<resolvers>
- <updatesite name="eclipse-juno" url="http://download.eclipse.org/releases/juno" cache="eclipse-juno" requirementStrategy="first" />
+ <updatesite name="eclipse-juno" url="http://download.eclipse.org/releases/juno" cache="eclipse-juno" requirementStrategy="first"/>
</resolvers>
</ivysettings>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings.adoc b/asciidoc/settings.adoc
index fc7729b..3ebd151 100644
--- a/asciidoc/settings.adoc
+++ b/asciidoc/settings.adoc
@@ -29,18 +29,18 @@ Here is an example of the settings file:
----
<ivysettings>
- <properties file="${ivy.settings.dir}/ivysettings-file.properties" />
- <settings defaultResolver="ibiblio" />
- <caches defaultCacheDir="${cache.dir}" checkUpToDate="false" />
+ <properties file="${ivy.settings.dir}/ivysettings-file.properties"/>
+ <settings defaultResolver="ibiblio"/>
+ <caches defaultCacheDir="${cache.dir}" checkUpToDate="false"/>
<resolvers>
- <ibiblio name="ibiblio" />
+ <ibiblio name="ibiblio"/>
<filesystem name="internal">
- <ivy pattern="${repository.dir}/[module]/ivy-[revision].xml" />
- <artifact pattern="${repository.dir}/[module]/[artifact]-[revision].[ext]" />
+ <ivy pattern="${repository.dir}/[module]/ivy-[revision].xml"/>
+ <artifact pattern="${repository.dir}/[module]/[artifact]-[revision].[ext]"/>
</filesystem>
</resolvers>
<modules>
- <module organisation="jayasoft" name=".*" resolver="internal" />
+ <module organisation="jayasoft" name=".*" resolver="internal"/>
</modules>
</ivysettings>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/caches.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/caches.adoc b/asciidoc/settings/caches.adoc
index 3770e67..6d0413e 100644
--- a/asciidoc/settings/caches.adoc
+++ b/asciidoc/settings/caches.adoc
@@ -75,9 +75,9 @@ cache to another place in your filesystem). Usually it is a good thing to check
----
<caches>
- <cache name="mycache" basedir="path/to/my/cache/1" />
- <cache name="mycache2" basedir="path/to/my/cache/2" />
-</caches>
+ <cache name="mycache" basedir="path/to/my/cache/1"/>
+ <cache name="mycache2" basedir="path/to/my/cache/2"/>
+</caches>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/caches/cache.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/caches/cache.adoc b/asciidoc/settings/caches/cache.adoc
index 8b13d24..decd3ec 100644
--- a/asciidoc/settings/caches/cache.adoc
+++ b/asciidoc/settings/caches/cache.adoc
@@ -40,7 +40,7 @@ By default also, the parsed module descriptor read from the cache are kept in a
|basedir|the path of the base directory to use to put repository cache data. *This should not point to a directory used as a repository!*|No, defaults to repositoryCacheDir defined in link:../../settings/caches.html[caches]
|ivyPattern|the pattern to use to store cached ivy files|No, defaults to default cache ivy pattern as configured in link:../../settings/caches.html[caches]
|artifactPattern|the pattern to use to store cached artifacts|No, defaults to default cache artifact pattern as configured in link:../../settings/caches.html[caches]
-|useOrigin|true to avoid the copy of local artifacts to the cache and use directly their original location, false otherwise.
+|useOrigin|true to avoid the copy of local artifacts to the cache and use directly their original location, false otherwise.
To know if an artifact is local ivy asks to the resolver. Only filesystem resolver is considered local by default, but this can be disabled if you want to force the copy on one filesystem resolver and use the original location on another. Note that it is safe to use useOrigin even if you use the cache for some non local resolvers. In this case the cache will behave as usual, copying files to the cache. Note also that this only applies to artifacts, not to ivy files, which are still copied in the cache.|No. defaults to the default value configured in link:../../settings/caches.html[caches]
|lockStrategy|the name of the link:../../settings/lock-strategies.html[lock strategy] to use for this cache|No, defaults to default lock strategy as configured in link:../../settings/caches.html[caches]
|defaultTTL|the default link:../../settings/caches/ttl.html[TTL] to use when no specific one is defined|No, defaults to ${ivy.cache.ttl.default}
@@ -66,19 +66,18 @@ To know if an artifact is local ivy asks to the resolver. Only filesystem resolv
[source, xml]
----
-<cache name="mycache"
+<cache name="mycache"
basedir="/path/to/mycache"
- ivyPattern="[module]/ivy-[revision].xml"
+ ivyPattern="[module]/ivy-[revision].xml"
artifactPattern="[module]/[artifact]-[revision].[ext]"
lockStrategy="no-lock"
defaultTTL="1s">
- <ttl revision="latest.integration" duration="200ms" />
- <ttl organisation="org1" duration="10m 20s" />
- <ttl organisation="org2" duration="5h" />
- <ttl organisation="org3" duration="2d 12h" />
+ <ttl revision="latest.integration" duration="200ms"/>
+ <ttl organisation="org1" duration="10m 20s"/>
+ <ttl organisation="org2" duration="5h"/>
+ <ttl organisation="org3" duration="2d 12h"/>
</cache>
----
Defines a cache called `mycache`, storing files in the `/path/to/mycache` directory using `[module]/ivy-[revision].xml` as pattern to store Ivy files and `[module]/[artifact]-[revision].[ext]` as pattern to store other artifacts. The lock strategy used by this cache is the `no-lock` strategy, which does not perform any locking. The defaultTTL used is of 1s, meaning that by default dynamic revision result will be stored and used for one second. TTL rules then define that all `latest.integration` revisions will be stored and used for 200ms, while other dynamic revisions from `org1` `org2` and `org3` modules will be stored respectively for 10 minutes 20 seconds; 5 hours; and 2 days and 12 hours.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/caches/ttl.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/caches/ttl.adoc b/asciidoc/settings/caches/ttl.adoc
index 669691a..575d401 100644
--- a/asciidoc/settings/caches/ttl.adoc
+++ b/asciidoc/settings/caches/ttl.adoc
@@ -21,7 +21,7 @@
*Tag:* ttl
-*__Since 2.0__*
+*__Since 2.0__*
Defines a TTL (Time To Live) rule for resolved revision caching.
@@ -42,7 +42,7 @@ XXd XXh XXm XXs XXXms
Where 'd' stands for days, 'h' for hours, 'm' for minutes, 's' for seconds and 'ms' for milliseconds. Any part of the specification can be omitted, so '12d', '2h 5m' and '1d 5ms' are all valid.
-The TTL duration can also be set to `eternal`, in which case once resolved the revision is always use, except when resolving in refresh mode.
+The TTL duration can also be set to `eternal`, in which case once resolved the revision is always use, except when resolving in refresh mode.
Using a 0ms TTL disable resolved revision caching for the given rule.
@@ -60,5 +60,3 @@ Using a 0ms TTL disable resolved revision caching for the given rule.
|matcher|the link:../../concept.html#matcher[matcher] to use to match the modules to which the resolver should be applied|No, defaults to exact
|duration|the TTL to apply (see above for format)|Yes
|=======
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/conflict-managers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/conflict-managers.adoc b/asciidoc/settings/conflict-managers.adoc
index b164762..19913ee 100644
--- a/asciidoc/settings/conflict-managers.adoc
+++ b/asciidoc/settings/conflict-managers.adoc
@@ -79,4 +79,3 @@ Here is a list of conflict manager types available, which can be used to define
|Element|Description|Cardinality
|any conflict manager|adds a conflict manager to the list of available conflict managers|0..n
|=======
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/credentials.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/credentials.adoc b/asciidoc/settings/credentials.adoc
index 3ecf77f..e1c242e 100644
--- a/asciidoc/settings/credentials.adoc
+++ b/asciidoc/settings/credentials.adoc
@@ -35,4 +35,3 @@ Configures HTTP authentication credentials. *__since 2.0__*.
|username|the username|Yes
|passwd|the password|Yes
|=======
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/include.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/include.adoc b/asciidoc/settings/include.adoc
index 2477583..a6b6d5d 100644
--- a/asciidoc/settings/include.adoc
+++ b/asciidoc/settings/include.adoc
@@ -80,7 +80,7 @@ The included ivysettings defines a resolver named default, which is an ivyrep re
<resolvers>
<mymacro name="includeworks" mymainrep="included/myrep" mysecondrep="included/secondrep"/>
</resolvers>
-</ivysettings>
+</ivysettings>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/latest-strategies.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/latest-strategies.adoc b/asciidoc/settings/latest-strategies.adoc
index 71dcbb5..3ede771 100644
--- a/asciidoc/settings/latest-strategies.adoc
+++ b/asciidoc/settings/latest-strategies.adoc
@@ -66,7 +66,7 @@ Here is an example of how you can do so:
<specialMeaning name="QA" value="4"/>
<specialMeaning name="PROD" value="5"/>
</latest-revision>
-</latest-strategies>
+</latest-strategies>
----
@@ -94,7 +94,6 @@ Example:
<specialMeaning name="rc" value="2"/>
<specialMeaning name="prod" value="3"/>
</latest-revision>
-</latest-strategies>
+</latest-strategies>
----
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/lock-strategies.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/lock-strategies.adoc b/asciidoc/settings/lock-strategies.adoc
index 504c5bd..971cf53 100644
--- a/asciidoc/settings/lock-strategies.adoc
+++ b/asciidoc/settings/lock-strategies.adoc
@@ -37,7 +37,7 @@ The following strategies are registered by default:
* *artifact-lock* +
This strategy acquires a lock whenever a module descriptor or an artifact is downloaded to the cache, which makes a good solution when you want to share your repository cache.
-Note that this strategy is based on file locking, performed by default using the `java.io.File.createNewFile()` atomicity (which is documented as atomic in the javadoc, but not recommended to perform locks).
+Note that this strategy is based on file locking, performed by default using the `java.io.File.createNewFile()` atomicity (which is documented as atomic in the javadoc, but not recommended to perform locks).
* *artifact-lock-nio (__since 2.4__)* +
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/macrodef.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/macrodef.adoc b/asciidoc/settings/macrodef.adoc
index e0fe47d..b79ccf7 100644
--- a/asciidoc/settings/macrodef.adoc
+++ b/asciidoc/settings/macrodef.adoc
@@ -27,7 +27,7 @@ This task eases the process of creating a new dependency resolver, because it av
It is generally used in combination with the link:../settings/include.html[include] feature to help reuse a macro in multiple settings files.
-A macro is defined by declaring an existing resolver within it. Then you can use attributes to pass parameters to the newly defined resolver type. Attributes are defined with a name, and optionally a default value, and are used using the following syntax:
+A macro is defined by declaring an existing resolver within it. Then you can use attributes to pass parameters to the newly defined resolver type. Attributes are defined with a name, and optionally a default value, and are used using the following syntax:
[source]
----
@@ -57,14 +57,14 @@ Example:
<ivysettings>
<macrodef name="mymacro">
<chain>
- <ibiblio name="ex1" />
- <ibiblio name="ex2.@{name}" m2compatible="true" />
+ <ibiblio name="ex1"/>
+ <ibiblio name="ex2.@{name}" m2compatible="true"/>
</chain>
</macrodef>
-
+
<resolvers>
- <mymacro name="default" />
- <mymacro name="other" />
+ <mymacro name="default"/>
+ <mymacro name="other"/>
</resolvers>
</ivysettings>
@@ -78,12 +78,12 @@ This is equivalent to:
<ivysettings>
<resolvers>
<chain name="default">
- <ibiblio name="default-ex1" />
- <ibiblio name="ex2.default" m2compatible="true" />
+ <ibiblio name="default-ex1"/>
+ <ibiblio name="ex2.default" m2compatible="true"/>
</chain>
<chain name="other">
- <ibiblio name="other-ex1" />
- <ibiblio name="ex2.other" m2compatible="true" />
+ <ibiblio name="other-ex1"/>
+ <ibiblio name="ex2.other" m2compatible="true"/>
</chain>
</resolvers>
</ivysettings>
@@ -97,7 +97,7 @@ This is equivalent to:
[options="header",cols="15%,50%,35%"]
|=======
|Attribute|Description|Required
-|name|name of the resover type created|Yes
+|name|name of the resolver type created|Yes
|=======
@@ -164,15 +164,14 @@ A complete example:
</filesystem>
</chain>
</macrodef>
-
+
<resolvers>
<mymacro name="default" mymainrep="path/to/myrep" mysecondrep="path/to/secondrep"/>
- <mymacro name="other"
- mymainrep="path/to/myrep"
- mysecondrep="path/to/secondrep"
+ <mymacro name="other"
+ mymainrep="path/to/myrep"
+ mysecondrep="path/to/secondrep"
myseconddirlayout="[module]/[type]s"/>
</resolvers>
</ivysettings>
----
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/macrodef/attribute.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/macrodef/attribute.adoc b/asciidoc/settings/macrodef/attribute.adoc
index 3b6348f..54a6096 100644
--- a/asciidoc/settings/macrodef/attribute.adoc
+++ b/asciidoc/settings/macrodef/attribute.adoc
@@ -32,6 +32,3 @@ Defines a macrodef attribute. See link:../macrodef.html[macrodef] for details.
|name|the name of the attribute|Yes
|default|the default value of the attribute if none is specified|No, by default attribute are required
|=======
-
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/module.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/module.adoc b/asciidoc/settings/module.adoc
index 9966f22..c6865e2 100644
--- a/asciidoc/settings/module.adoc
+++ b/asciidoc/settings/module.adoc
@@ -21,7 +21,7 @@
*Tag:* module
-Define a module set rule. The tag defines a module set, by giving an expression and the matcher to use for organisation, name, revision and any extra attribute identifying your modules. The rule matching is performed in order, and is using a pattern matcher. Hence you can use `*` to specify all, or simply avoid specifying the attribute.
+Define a module set rule. The tag defines a module set, by giving an expression and the matcher to use for organisation, name, revision and any extra attribute identifying your modules. The rule matching is performed in order, and is using a pattern matcher. Hence you can use `*` to specify all, or simply avoid specifying the attribute.
The revision and extra attributes are only used for rules defining the resolver to use. For other settings, use only organisation and module name.
@@ -107,7 +107,7 @@ Uses `myapachecommonsresolver` for all modules from `apache` beginning with `com
----
<modules>
- <module organisation="apache" name="ivy*" matcher="glob" conflict-manager="latest-time"/>
+ <module organisation="apache" name="ivy*" matcher="glob" conflict-manager="latest-time"/>
</modules>
----
@@ -121,10 +121,9 @@ Uses `latest-time` conflict manager for all modules from `apache` whose name beg
----
<modules>
- <module organisation="apache" name="ivy*" matcher="glob" branch="fix-103"/>
+ <module organisation="apache" name="ivy*" matcher="glob" branch="fix-103"/>
</modules>
----
Uses `fix-103` as default branch for all modules from `apache` whose name begins with `ivy`.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/modules.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/modules.adoc b/asciidoc/settings/modules.adoc
index 0c3ab25..52afad0 100644
--- a/asciidoc/settings/modules.adoc
+++ b/asciidoc/settings/modules.adoc
@@ -38,5 +38,3 @@ NOTE: You can greatly improve the performance of dependency resolution by config
|Element|Description|Cardinality
|link:../settings/module.html[module]|defines a module set rule|1..n
|=======
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespace.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace.adoc b/asciidoc/settings/namespace.adoc
index ed02771..8d77a48 100644
--- a/asciidoc/settings/namespace.adoc
+++ b/asciidoc/settings/namespace.adoc
@@ -126,6 +126,3 @@ There are two main possibilities for using these rules. By default, a namespace
</namespace>
----
-
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespace/dest.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/dest.adoc b/asciidoc/settings/namespace/dest.adoc
index b2aa255..8a16ed8 100644
--- a/asciidoc/settings/namespace/dest.adoc
+++ b/asciidoc/settings/namespace/dest.adoc
@@ -55,4 +55,3 @@ For details about regexp and groups, see the link:https://docs.oracle.com/javase
----
Matches modules from `systemorg2` which have a name beginning with `system` followed by a `minus` and anything else, and translate it to organisation `B` and module the part following `system-` of the original name.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespace/fromtosystem.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/fromtosystem.adoc b/asciidoc/settings/namespace/fromtosystem.adoc
index d97ce89..9ce2dca 100644
--- a/asciidoc/settings/namespace/fromtosystem.adoc
+++ b/asciidoc/settings/namespace/fromtosystem.adoc
@@ -32,5 +32,3 @@ Defines a one way translation rule, i.e. a translation from system namespace to
|link:../../settings/namespace/src.html[src]|defines a source name which can be accepted|1..n
|link:../../settings/namespace/dest.html[dest]|defines the translation to apply when a name is accepted by an src pattern|1
|=======
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespace/rule.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/rule.adoc b/asciidoc/settings/namespace/rule.adoc
index 045f23d..e1a70b8 100644
--- a/asciidoc/settings/namespace/rule.adoc
+++ b/asciidoc/settings/namespace/rule.adoc
@@ -35,4 +35,3 @@ See the link:../../settings/namespace.html[namespace] doc for details.
|link:../../settings/namespace/fromtosystem.html[fromsystem]|defines the translation to apply from the system namespace to the defined namespace|1
|link:../../settings/namespace/fromtosystem.html[tosystem]|defines the translation to apply from the defined namespace to the system namespace|1
|=======
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespace/src.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/src.adoc b/asciidoc/settings/namespace/src.adoc
index 98a840c..515bb75 100644
--- a/asciidoc/settings/namespace/src.adoc
+++ b/asciidoc/settings/namespace/src.adoc
@@ -33,5 +33,3 @@ Defines the acceptation part of a translation rule. If a name matches this src,
|module|the module name to match as a regexp|No, defaults to .*
|rev|the revision to match as a regexp|No, defaults to .*
|=======
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespaces.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespaces.adoc b/asciidoc/settings/namespaces.adoc
index d6b16ae..a872a02 100644
--- a/asciidoc/settings/namespaces.adoc
+++ b/asciidoc/settings/namespaces.adoc
@@ -45,5 +45,3 @@ This very powerful feature is thoroughly used in the link:../tutorial/build-repo
|Element|Description|Cardinality
|link:../settings/namespace.html[namespace]|defines a new namespace|0..n
|=======
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/outputters.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/outputters.adoc b/asciidoc/settings/outputters.adoc
index 932c604..d284a53 100644
--- a/asciidoc/settings/outputters.adoc
+++ b/asciidoc/settings/outputters.adoc
@@ -21,7 +21,7 @@
*Tag:* outputters
-Defines a list of report outputters usable in ivy.
+Defines a list of report outputters usable in ivy.
A report outputter is used at the end of the resolve process to generate a report of how the resolve has been performed.
@@ -61,4 +61,3 @@ To see how to define your own report outputter see link:../extend.html[Extending
|Element|Description|Cardinality
|any report outputter|adds a report outputter to the list of available ones|0..n
|=======
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/parsers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/parsers.adoc b/asciidoc/settings/parsers.adoc
index 5208b66..ce07ba6 100644
--- a/asciidoc/settings/parsers.adoc
+++ b/asciidoc/settings/parsers.adoc
@@ -44,5 +44,3 @@ this parser is able to parse Maven2 `pom` files
|Element|Description|Cardinality
|any module descriptor parser|adds a module descriptor parser to the list of available parsers|0..n
|=======
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/properties.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/properties.adoc b/asciidoc/settings/properties.adoc
index 977cb80..e276eb5 100644
--- a/asciidoc/settings/properties.adoc
+++ b/asciidoc/settings/properties.adoc
@@ -33,11 +33,8 @@ Loads a properties file into ivy variables. See the variables chapter above for
[options="header",cols="15%,50%,35%"]
|=======
|Attribute|Description|Required
-|file|a path to a properties file to load
+|file|a path to a properties file to load
.2+|One of these
|environment|the prefix to use when retrieving environment variables *__(since 2.0)__*
|override|indicates if the variable found in the properties file should override its previous value, if any *__(since 1.3)__*|No, defaults to true
|=======
-
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/property.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/property.adoc b/asciidoc/settings/property.adoc
index 9989290..bfbd998 100644
--- a/asciidoc/settings/property.adoc
+++ b/asciidoc/settings/property.adoc
@@ -21,7 +21,7 @@
*Tag:* property
-Defines an ivy variable.
+Defines an ivy variable.
*__since 1.3__*: The optional override attribute enables you to avoid overriding the previous value of the variable, which makes the definition behave like an ant property, which is particularly useful to define default values (values which are used only if they haven't been defined yet).
@@ -33,7 +33,7 @@ Defines an ivy variable.
|Attribute|Description|Required
|name|the name of the variable to define|Yes
|value|the new value the variable must take|Yes
-|override|true if the previous value (if any) of the variable should overriden, false otherwise|No, defaults to true
+|override|true if the previous value (if any) of the variable should overridden, false otherwise|No, defaults to true
|ifset|the variable will be set only if the provided 'ifset' variable is already set (Since 2.4)|No
|unlessset|the variable will not be set unless the provided 'unlessset' variable is set (Since 2.4)|No
|=======
@@ -70,7 +70,7 @@ Sets the variable myvar to the value myvalue only if myvar has not been set yet.
----
<properties environment="env"/>
- <property name="ivy.repos.server" value="${env.IVY_SERVER}" override="false" ifset="env.IVY_SERVER" />
+ <property name="ivy.repos.server" value="${env.IVY_SERVER}" override="false" ifset="env.IVY_SERVER"/>
<property name="ivy.repos.server" value="http://ivy:8081" override="false"/>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/resolvers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/resolvers.adoc b/asciidoc/settings/resolvers.adoc
index 5faf33a..b1fe1aa 100644
--- a/asciidoc/settings/resolvers.adoc
+++ b/asciidoc/settings/resolvers.adoc
@@ -108,10 +108,10 @@ By using such a resolver at the beginning of a chain, you can be sure that Ivy w
==== Maven
-Any resolver which is able to parse a Maven pom.xml file has to detect the related sources or javadocs artifacts. This often involves sevrals network connection even if neither the sources nor the javadoc are requested to be downloaded.
+Any resolver which is able to parse a Maven pom.xml file has to detect the related sources or javadocs artifacts. This often involves several network connections even if neither the sources nor the javadoc are requested to be downloaded.
-*__since 2.5__* Setting the property `ivy.maven.lookup.sources` to `false` disable the lookup of the sources artifact.
-And setting the property `ivy.maven.lookup.javadoc` to `false` disable the lookup of the javadoc artifact.
+*__since 2.5__* Setting the property `ivy.maven.lookup.sources` to `false` disable the lookup of the sources artifact.
+And setting the property `ivy.maven.lookup.javadoc` to `false` disable the lookup of the javadoc artifact.
=== Attributes
@@ -127,7 +127,7 @@ And setting the property `ivy.maven.lookup.javadoc` to `false` disable the looku
|changingPattern|Indicates for which revision pattern this resolver should check lastmodified date to know if an artifact file is up to date. *__since 1.4__*. See link:../concept.html#change[cache and change management] for details.|No, defaults to none|Yes|Yes
|changingMatcher|The name of the link:../concept.html#matcher[pattern matcher] to use to match a revision against the configured changingPattern. *__since 1.4__*. See link:../concept.html#change[cache and change management] for details.|No, defaults to exactOrRegexp|Yes|Yes
|alwaysCheckExactRevision|Indicates if this resolver should check the given revision even if it's a special one (like latest.integration). *__since 1.3__*|No, defaults to ${ivy.default.always.check.exact.revision}|No|Yes
-|namespace|The name of the namespace to which this resolver belons *__since 1.3__*|No, defaults to 'system'|Yes|Yes
+|namespace|The name of the namespace to which this resolver belongs *__since 1.3__*|No, defaults to 'system'|Yes|Yes
|checkconsistency|true to check consistency of module descriptors found by this resolver, false to avoid consistency check *__since 1.3__*|No, defaults to true|No|Yes
|descriptor|'optional' if a module descriptor (usually an ivy file) is optional for this resolver, 'required' to refuse modules without module descriptor *__since 2.0__*|No, defaults to 'optional'|No (except dual)|Yes
|allownomd|_DEPRECATED. Use descriptor="required | optional" instead._
@@ -164,4 +164,3 @@ And setting the property `ivy.maven.lookup.javadoc` to `false` disable the looku
----
Defines a filesystem resolver, named `1`, which is then used in two chains, the first which combines the filesystem resolver with an ivyrep resolver, and second which combines the filesystem resolver with an ibiblio resolver, and which returns the first module found, and uses the whole chain to download artifacts (see corresponding resolvers documentation for details about them). Resolver `1` will use a cache named `cache-1` which should have been defined under the caches element.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/settings.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/settings.adoc b/asciidoc/settings/settings.adoc
index 9b84985..6fbea28 100644
--- a/asciidoc/settings/settings.adoc
+++ b/asciidoc/settings/settings.adoc
@@ -31,7 +31,7 @@ _validate_ indicates if ivy files should generally be validated against the xsd
1. in ant tasks
2. in resolvers
-
+
So if there is a setting in the resolver, it always wins against all other settings.
@@ -59,4 +59,3 @@ So if there is a setting in the resolver, it always wins against all other setti
|[line-through]#cacheArtifactPattern#|a pattern to indicate where artifact files should be put in cache. +
__Deprecated, we recommend using artifactPattern on the link:../settings/caches.html[caches] tag instead__|No, defaults to [organisation]/[module]/[type]s/[artifact]-[revision].[ext]
|=======
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/signers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/signers.adoc b/asciidoc/settings/signers.adoc
index eb04532..a83e1e5 100644
--- a/asciidoc/settings/signers.adoc
+++ b/asciidoc/settings/signers.adoc
@@ -26,7 +26,7 @@
Defines a list of detached signature generators usable in ivy. Each generator is identified by its name, given as an attribute.
The child tags used to configure the signature generator must be equal to the name of a signature generator type (either built-in or added with the typedef tag).
-Ivy supports the following signature generator out of the box:
+Ivy supports the following signature generator out of the box:
* pgp +
@@ -75,7 +75,7 @@ This generator is capable of generating an OpenPGP compatible ASCII armored deta
----
<signers>
- <pgp name="mypgp" password="my-password" />
+ <pgp name="mypgp" password="my-password"/>
</signers>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/status.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/status.adoc b/asciidoc/settings/status.adoc
index a657d40..4131e37 100644
--- a/asciidoc/settings/status.adoc
+++ b/asciidoc/settings/status.adoc
@@ -35,4 +35,3 @@ See link:../settings/statuses.html[statuses] page for details about how statuses
|name|name of status defined|Yes
|integration|true if this is an integration status, false otherwise|No, defaults to false
|=======
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/statuses.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/statuses.adoc b/asciidoc/settings/statuses.adoc
index 5c9e4ed..1c0c6d0 100644
--- a/asciidoc/settings/statuses.adoc
+++ b/asciidoc/settings/statuses.adoc
@@ -62,9 +62,9 @@ NOTE: The statuses order is important, the first is considered the more mature,
<status name="gold" integration="false"/>
<status name="silver" integration="false"/>
<status name="bronze" integration="true"/>
-</statuses>
+</statuses>
----
-Defines 3 statuses, `gold`, `silver` and `bronze`. The default status used when none is declared in an ivy file will be `bronze`.
-It is also considered as an integration status, and thus doesn't trigger any recrusive delivery.
+Defines 3 statuses, `gold`, `silver` and `bronze`. The default status used when none is declared in an ivy file will be `bronze`.
+It is also considered as an integration status, and thus doesn't trigger any recursive delivery.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/triggers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/triggers.adoc b/asciidoc/settings/triggers.adoc
index 64283df..acfd5ac 100644
--- a/asciidoc/settings/triggers.adoc
+++ b/asciidoc/settings/triggers.adoc
@@ -26,14 +26,14 @@
Defines a list of triggers to activate on some Ivy events.
A trigger is an action which is performed whenever a particular event occurs.
-Ivy supports 3 type of triggers out of the box:
+Ivy supports 3 type of triggers out of the box:
* ant-call +
- calls a target in the same build as the original one whenever a particular event occurs.
+ calls a target in the same build as the original one whenever a particular event occurs.
* ant-build +
- calls an ant build which may be in another ant build script.
+ calls an ant build which may be in another ant build script.
* log +
echo a message, usually in a file
@@ -47,385 +47,385 @@ The following events are available in Ivy:
|=======
|Name|Attributes|Description
|pre-resolve|
-
-
+
+
* organisation +
the organisation of the module for which the dependencies will be resolved
-
+
* module +
the name of the module for which the dependencies will be resolved
-
+
* revision +
the revision of the module for which the dependencies will be resolved
-
+
* conf +
comma separated list of configurations which will be resolved
-
+
|Fired at the beginning of the resolve process, before module dependencies and transitive dependencies are resolved.
|pre-resolve-dependency|
-
-
+
+
* organisation +
the organisation of the dependency resolved
-
+
* module +
the name of the dependency resolved
-
+
* req-revision +
the requested revision for the dependency *__since 2.0__* (provided for consistency with post-resolve-dependency)
-
+
* req-revision-default +
the default requested revision constraint for the dependency *__since 2.0__*
-
+
* req-revision-dynamic +
the requested revision dynamic constraint for the dependency *__since 2.0__*
-
+
* revision +
the requested revision for the dependency
-
+
* resolver +
the name of the resolver used to resolve the dependency
-
+
|Fired before each dependency is resolved. In this case resolved means resolving the actual revision if the requested revision is a version constraint and not a static version, and downloading all necessary metadata information.
|post-resolve-dependency|
-
-
+
+
* organisation +
the organisation of the dependency resolved
-
+
* module +
the name of the dependency resolved
-
+
* req-revision +
the requested revision for the dependency *__since 2.0__*
-
+
* req-revision-default +
the default requested revision constraint for the dependency *__since 2.0__*
-
+
* req-revision-dynamic +
the requested revision dynamic constraint for the dependency *__since 2.0__*
-
+
* revision +
the revision of the dependency resolved, or the requested revision if the resolution was not successful
-
+
* resolved +
true if the resolution was successful, false otherwise
-
+
* duration +
the time elapsed to resolve the dependency (in ms) *__since 2.0__*
-
+
* resolver +
the name of the resolver used to resolve the dependency
-
+
* any extra attribute +
all extra attributes found on the info tag of the resolved dependency are available *__since 2.0__*
-
+
|Fired after each dependency is resolved
|post-resolve|
-
-
+
+
* organisation +
the organisation of the module for which the dependencies have been resolved
-
+
* module +
the name of the module for which the dependencies have been resolved
-
+
* revision +
the revision of the module for which the dependencies have been resolved
-
+
* conf +
comma separated list of configurations resolved
-
+
* resolve-id +
the identifier of the resolution process *__since 2.0__*
-
+
* nb-dependencies +
total number of dependencies, including transitive and evicted ones *__since 2.0__*
-
+
* nb-artifacts +
total number of artifacts resolved, excluding metadata artifacts *__since 2.0__*
-
+
* resolve-duration +
-the time (in ms) elapsed to resolve dependencies, before dowloading artifacts *__since 2.0__*
-
+the time (in ms) elapsed to resolve dependencies, before downloading artifacts *__since 2.0__*
+
* download-duration +
the time (in ms) elapsed to download all artifacts, excluding metadata artifacts downloaded during the first phase of the resolution process *__since 2.0__*
-
+
* download-size +
the total size (in bytes) of all downloaded artifacts, excluding metadata artifacts. Only artifacts actually downloaded (not in cache or used from their original location) are considered *__since 2.0__*
-
+
|Fired at the end of the resolve process, when all module dependencies have been resolved
|pre-download-artifact|
-
-
+
+
* organisation +
the organisation of the artifact which is about to be downloaded
-
+
* module +
the name of the module of the artifact which is about to be downloaded
-
+
* revision +
the revision of the the artifact which is about to be downloaded
-
+
* artifact +
the name of the the artifact which is about to be downloaded
-
+
* type +
the type of the the artifact which is about to be downloaded
-
+
* ext +
the extension of the the artifact which is about to be downloaded
-
+
* metadata +
true if the artifact to be downloaded is a metadata artifact, false for published artifacts *__since 2.0__*
-
+
* resolver +
the name of the resolver used to download the artifact
-
+
* origin +
the origin location from which it will be downloaded
-
+
* local +
true if it's a local artifact, false otherwise
-
+
|Fired before an artifact is downloaded from a repository to the cache
|post-download-artifact|
-
-
+
+
* organisation +
the organisation of the artifact which was just downloaded
-
+
* module +
the name of the module of the artifact which was just downloaded
-
+
* revision +
the revision of the the artifact which was just downloaded
-
+
* artifact +
the name of the the artifact which was just downloaded
-
+
* type +
the type of the the artifact which was just downloaded
-
+
* ext +
the extension of the the artifact which was just downloaded
-
+
* metadata +
true if the downloaded artifact is a metadata artifact, false for published artifacts *__since 2.0__*
-
+
* resolver +
the name of the resolver used to download the artifact
-
+
* origin +
the origin location from which it was downloaded
-
+
* local +
true if it's a local artifact, false otherwise
-
+
* size +
the size in bytes of the downloaded artifact
-
+
* duration +
the time elapsed to download the artifact (in ms) *__since 2.0__*
-
+
* file +
the file to which it has been downloaded
-
+
|Fired after an artifact has been downloaded from a repository to the cache
-|pre-retrieve
+|pre-retrieve
*__since 2.0__*|
-
-
+
+
* organisation +
the organisation of the module for which the dependencies will be retrieved
-
+
* module +
the name of the module for which the dependencies will be retrieved
-
+
* revision +
the revision of the module for which the dependencies will be retrieved
-
+
* conf +
comma separated list of configurations which will be retrieved
-
+
* symlink +
true if Ivy will use symbolic links instead of copies on supported platforms, false otherwise
-
+
* sync +
true if the retrieve process will be performed in sync mode, false otherwise
-
+
|Fired at the beginning of the retrieve process.
-|post-retrieve
+|post-retrieve
*__since 2.0__*|
-
-
+
+
* organisation +
the organisation of the module for which the dependencies have been retrieved
-
+
* module +
the name of the module for which the dependencies will be retrieved
-
+
* revision +
the revision of the module for which the dependencies have been retrieved
-
+
* conf +
comma separated list of configurations which have been retrieved
-
+
* symlink +
true if Ivy used symbolic links instead of copies on supported platforms, false otherwise
-
+
* sync +
true if the retrieve process has been performed in sync mode, false otherwise
-
+
* duration +
the time elapsed in ms during the retrieve process
-
+
* size +
the total size of artifacts which have actually been copied (or symlinked)
-
+
* nbCopied +
the number of artifacts copied or symlinked
-
+
* nbUptodate +
the number of artifacts which were already present and up to date at the destination location
-
+
|Fired at the end of the retrieve process.
-|pre-retrieve-artifact
+|pre-retrieve-artifact
*__since 2.1__*|
-
-
+
+
* organisation +
the organisation of the artifact which is about to be retrieved
-
+
* module +
the name of the module of the artifact which is about to be retrieved
-
+
* revision +
the revision of the the artifact which is about to be retrieved
-
+
* artifact +
the name of the the artifact which is about to be retrieved
-
+
* type +
the type of the the artifact which is about to be retrieved
-
+
* ext +
the extension of the the artifact which is about to be retrieved
-
+
* metadata +
-true if the retrieved artifact is a metadata artifact, false for published artifacts
-
+true if the retrieved artifact is a metadata artifact, false for published artifacts
+
* size +
the size in bytes of the retrieved artifact
-
+
* from +
the absolute path from which it will be retrieved (usually a location in cache)
-
+
* to +
the absolute path to which it will be retrieved
-
+
|Fired before an artifact is retrieved from the cache to a local location
-|post-retrieve-artifact
+|post-retrieve-artifact
*__since 2.1__*|
-
-
+
+
* organisation +
the organisation of the artifact which has just been retrieved
-
+
* module +
the name of the module of the artifact which has just been retrieved
-
+
* revision +
the revision of the the artifact which has just been retrieved
-
+
* artifact +
the name of the the artifact which has just been retrieved
-
+
* type +
the type of the the artifact which has just been retrieved
-
+
* ext +
the extension of the the artifact which has just been retrieved
-
+
* metadata +
-true if the retrieved artifact is a metadata artifact, false for published artifacts
-
+true if the retrieved artifact is a metadata artifact, false for published artifacts
+
* size +
the size in bytes of the retrieved artifact
-
+
* from +
the absolute path from which it has just been retrieved (usually a location in cache)
-
+
* to +
the absolute path to which it has just been retrieved
-
+
|Fired after an artifact is retrieved from the cache to a local location
-|pre-publish-artifact
+|pre-publish-artifact
*__since 2.0__*|
-
-
+
+
* organisation +
the organisation of the artifact which is about to be published
-
+
* module +
the name of the module of the artifact which is about to be published
-
+
* revision +
the revision of the the artifact which is about to be published
-
+
* artifact +
the name of the the artifact which is about to be published
-
+
* type +
the type of the the artifact which is about to be published
-
+
* ext +
the extension of the the artifact which is about to be published
-
+
* resolver +
the name of the resolver into which the artifact is about to be published
-
+
* file +
the absolute path of the source file for the artifact
-
+
* overwrite +
"true" if the new data will overwrite existing artifacts, "false" otherwise
-
+
|Fired before an artifact is published into a repository
-|post-publish-artifact
+|post-publish-artifact
*__since 2.0__*|
-
-
+
+
* organisation +
the organisation of the artifact that was published
-
+
* module +
the name of the module of the artifact that was published
-
+
* revision +
the revision of the the artifact that was published
-
+
* artifact +
the name of the the artifact that was published
-
+
* type +
the type of the the artifact that was published
-
+
* ext +
the extension of the the artifact that was published
-
+
* resolver +
the name of the resolver into which the artifact was published
-
+
* file +
the absolute path of the source file for the artifact
-
+
* overwrite +
"true" if the new data overwrote existing artifacts, "false" otherwise
-
+
* status +
"successful" if the artifact published successfully; "failed" if the artifact failed to publish, or if the status is unknown
-
+
|Fired after an artifact is published into a repository. Note that this event is fired whether or not the publication succeeded. The "status" property can be checked to verify success.
|=======
@@ -447,7 +447,7 @@ The child tag used for the dependency resolver must be equal to a name of a trig
== Built-in Triggers
-Ivy comes with 3 built-in triggers:
+Ivy comes with 3 built-in triggers:
[options="header",cols="15%,50%"]
@@ -465,9 +465,9 @@ Ivy comes with 3 built-in triggers:
All triggers share some common attributes detailed here.
-Among these attributes, you will find how to select when the trigger should be performed. You have to provide an event name, which is simple, but you can also use a filter expression. The syntax for this expression is very simple and limited:
+Among these attributes, you will find how to select when the trigger should be performed. You have to provide an event name, which is simple, but you can also use a filter expression. The syntax for this expression is very simple and limited:
- - you can use the = operator to compare an attribute (left operande) with a value (right operande).
+ - you can use the = operator to compare an attribute (left operand) with a value (right operand).
- you can use AND OR NOT as boolean operators
- you cannot use parenthesis to change the precedence
@@ -507,7 +507,7 @@ Note that by default the ant build is triggered only once per build file. See be
<triggers>
<ant-build antfile="${ivy.settings.dir}/[module]/build.xml" target="publish"
event="pre-resolve-dependency" filter="revision=latest.integration"
- onlyonce="false" />
+ onlyonce="false"/>
</triggers>
----
@@ -535,9 +535,9 @@ Here is how the target can look like:
<target name="unzip">
<echo>
- unzipping artifact:
- organisation=${dep.organisation}
- module=${dep.module}
+ unzipping artifact:
+ organisation=${dep.organisation}
+ module=${dep.module}
revision=${dep.revision}
artifact=${dep.artifact}
type=${dep.type}
@@ -561,7 +561,7 @@ Here is how the target can look like:
----
<triggers>
- <log file="ivy.log"
+ <log file="ivy.log"
message='downloaded "${origin}" to "${file}" (${duration}ms - ${size}B)'
event="post-download-artifact" filter="status=successful"/>
</triggers>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/typedef.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/typedef.adoc b/asciidoc/settings/typedef.adoc
index 872aa67..a956dcf 100644
--- a/asciidoc/settings/typedef.adoc
+++ b/asciidoc/settings/typedef.adoc
@@ -33,5 +33,3 @@ See link:../extend.html[how to write and plug your own dependency resolver] for
|name|the name of the type to define. This name is then used as an xml tag.|Yes
|classname|the fully qualified class name of the type to define.|Yes
|=======
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/version-matchers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/version-matchers.adoc b/asciidoc/settings/version-matchers.adoc
index 6b9de5a..5406510 100644
--- a/asciidoc/settings/version-matchers.adoc
+++ b/asciidoc/settings/version-matchers.adoc
@@ -21,7 +21,7 @@
*Tag:* version-matchers
-Defines a list of version matchers. *__since 1.4__*
+Defines a list of version matchers. *__since 1.4__*
The child tag used for the version matcher must be equal to a name of a report outputter type (added with the `typedef` tag).
@@ -33,7 +33,7 @@ A version matcher is used to evaluate if a dependency version constraint matches
[options="header",cols="15%,50%,35%"]
|=======
-|Attribute|Descrition|Required
+|Attribute|Description|Required
|usedefaults|when set to true, includes the built-in version matchers (Latest, Sub Revision, and Version Ranger Matcher). Exact Revision Matcher is always included|No, defaults to false
|=======
@@ -52,7 +52,7 @@ A version matcher is used to evaluate if a dependency version constraint matches
== Built-in Version Matchers
-=== Exact Revesion Matcher
+=== Exact Revision Matcher
A matcher that matches a dependency revision id to the module revision id using simple string equality.
@@ -101,10 +101,10 @@ Range types are exhaustively listed by example in the table below.
| [1.0,2.0[ | all versions greater or equal to 1.0 and lower than 2.0
| ]1.0,2.0] | all versions greater than 1.0 and lower or equal to 2.0
| ]1.0,2.0[ | all versions greater than 1.0 and lower than 2.0
-| [1.0,) | all versions greater or equal to 1.0
+| [1.0,) | all versions greater or equal to 1.0
| ]1.0,) | all versions greater than 1.0
| (,2.0] | all versions lower or equal to 2.0
-| (,2.0[ | all versions lower than 2.0
+| (,2.0[ | all versions lower than 2.0
|=======
@@ -122,7 +122,7 @@ The version pattern matcher allows for more flexibility in pattern matching at t
----
<pattern-vm>
- <match revision="foo" pattern="${major}\.${minor}\.\d+" args="major, minor" matcher="regexp" />
+ <match revision="foo" pattern="${major}\.${minor}\.\d+" args="major, minor" matcher="regexp"/>
</pattern-vm>
----
@@ -134,7 +134,7 @@ The version pattern matcher allows for more flexibility in pattern matching at t
[source, xml]
----
-<dependency org="acme" name="tool" rev="foo(1, 3)" />
+<dependency org="acme" name="tool" rev="foo(1, 3)"/>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/standalone.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/standalone.adoc b/asciidoc/standalone.adoc
index 5789e7a..6eac03b 100644
--- a/asciidoc/standalone.adoc
+++ b/asciidoc/standalone.adoc
@@ -44,7 +44,7 @@ usage: ivy
==== resolve options
-ivy <ivyfile> use given file as ivy file
-refresh refresh dynamic resolved revisions
- -dependency <organisation> <module> <revision>
+ -dependency <organisation> <module> <revision>
use this instead of ivy file to do the rest of the
work with this as a dependency.
-confs <configurations> resolve given configurations
@@ -142,7 +142,7 @@ java -jar ivy.jar -settings path/to/myivysettings.xml -dependency apache commons
----
-calls ivy with given ivysettings file and resolve apache `commons-lang 2.0`.
+calls ivy with given ivysettings file and resolve apache `commons-lang 2.0`.
This is equivalent to:
@@ -161,8 +161,7 @@ with `ivy.xml` like this:
<ivy-module version="1.0">
<info organisation="org"
module="standalone"
- revision="working"
- />
+ revision="working"/>
<dependencies>
<dependency org="apache" name="commons-lang" rev="2.0" conf="default->*"/>
</dependencies>
@@ -182,7 +181,7 @@ java -jar ivy.jar -settings path/to/myivysettings.xml -ivy path/to/myivy.xml -ca
----
-calls ivy with given ivysettings file and resolves the dependencies found in the given ivy file, and then outputs the classpath of resolved artifacts in cache in a file. This file can then be used to define a classpath corresponding to all the resolved dependencies for any java program.
+calls ivy with given ivysettings file and resolves the dependencies found in the given ivy file, and then outputs the classpath of resolved artifacts in cache in a file. This file can then be used to define a classpath corresponding to all the resolved dependencies for any java program.
'''
@@ -196,4 +195,4 @@ java -jar ivy.jar -settings path/to/myivysettings.xml -dependency bar foo 2.0 -m
----
-calls ivy with given ivysettings file and resolves the depedency `bar` `foo` `2.0`, and then runs `org.foo.FooMain` class with the resolved artifacts as classpath
+calls ivy with given ivysettings file and resolves the dependency `bar` `foo` `2.0`, and then runs `org.foo.FooMain` class with the resolved artifacts as classpath
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/style/style.css
----------------------------------------------------------------------
diff --git a/asciidoc/style/style.css b/asciidoc/style/style.css
index 033ea75..3d0948e 100644
--- a/asciidoc/style/style.css
+++ b/asciidoc/style/style.css
@@ -17,242 +17,225 @@
*/
body {
- margin: 0;
- padding: 0;
- background-color: #5a7418;
+ margin: 0;
+ padding: 0;
+ background-color: #5a7418;
}
#body {
- display: table;
- margin: 8px auto;
- padding: 0;
- width: 98%;
- color: #000;
- background-color: #fff;
- border-radius: 5px;
- padding-top: 5px;
- padding-bottom: 5px;
+ display: table;
+ margin: 8px auto;
+ padding: 0;
+ width: 98%;
+ color: #000;
+ background-color: #fff;
+ border-radius: 5px;
+ padding-top: 5px;
+ padding-bottom: 5px;
}
body, p, td, li, ul, ol {
- font-family: Verdana, Helvetica, Arial, sans-serif;
- font-size: small;
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-size: small;
}
li p {
- margin: 0;
+ margin: 0;
}
h1, h2, h3, h4, h5, h6 {
- color: #7a9438;
- font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+ color: #7a9438;font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
}
h1 {
- color: #7a9438;
- background-color: #fff;
- background: none;
+ color: #7a9438;
+ background-color: #fff;
+ background: none;
}
h2 {
- color: #fff;
- background-color: #7a9438;
- padding-left: 10px;
- font-size: 1.6em;
- border-radius: 5px;
+ color: #fff;
+ background-color: #7a9438;
+ padding-left: 10px;
+ font-size: 1.6em;
+ border-radius: 5px;
}
h3 {
- font-size: 1.4em;
+ font-size: 1.4em;
}
h4 {
- font-size: 1.2em;
+ font-size: 1.2em;
}
h5 {
- font-size: 1.1em;
+ font-size: 1.1em;
}
tr.dark td, tr.light td {
- padding: 0.3em;
+ padding: 0.3em;
}
a:link {
- text-decoration: none;
- font-weight: bold;
- color: #7a9438;
+ text-decoration: none;
+ font-weight: bold;
+ color: #7a9438;
}
a:visited {
- text-decoration: none;
- font-weight: bold;
- color: #7a9438;
+ text-decoration: none;
+ font-weight: bold;
+ color: #7a9438;
}
a:hover, a:active {
- font-weight: bold;
- text-decoration: underline;
- color: #7a9438;
+ font-weight: bold;
+ text-decoration: underline;
+ color: #7a9438;
}
p {
- margin: 0 0 1.3em 0;
- padding: 0;
+ margin: 0 0 1.3em 0;
+ padding: 0;
}
blockquote {
- padding: 0 15px 0 15px;
- margin: 15px 50px 15px 50px;
- text-align: left;
- font-size: 1.2em;
- line-height: 1.3em;
- font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+ padding: 0 15px 0 15px;
+ margin: 15px 50px 15px 50px;
+ text-align: left;
+ font-size: 1.2em;
+ line-height: 1.3em;
+ font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
color: #696969;
}
pre {
- padding: 0.75em 1.5em;
- font-size: 1em;
- background-color: #eee;
- border: 1px solid #ddd;
+ padding: 0.75em 1.5em;
+ font-size: 1em;
+ background-color: #eee;
+ border: 1px solid #ddd;
}
code {
- background-color: #EEE;
+ background-color: #EEE;
}
#home img {
- padding: 5px 20px 10px 10px;
+ padding: 5px 20px 10px 10px;
}
.product img {
- padding: 5px 20px 10px 10px;
+ padding: 5px 20px 10px 10px;
}
#navcontainer {
- color: white;
- margin-left: 20px;
- background-color:#7a9438;
+ color: white;
+ margin-left: 20px;
+ background-color:#7a9438;
}
#navcontainer a {
- color: white;
- text-decoration: none;
+ color: white;
+ text-decoration: none;
}
#nav {
- background-color:#7a9438;
+ background-color:#7a9438;
}
#nav ul {
- background-color:#7a9438;
- border-top: 1px solid #7a9438;
- border-right: 1px solid #7a9438;
- border-bottom: 1px solid #7a9438;
- border-left: 0.75em solid #7a9438;
+ background-color:#7a9438;
+ border-top: 1px solid #7a9438;
+ border-right: 1px solid #7a9438;
+ border-bottom: 1px solid #7a9438;
+ border-left: 0.75em solid #7a9438;
}
#nav li a {
- color: #fff;
+ color: #fff;
}
#nav .title {
- color: #fff;
- background: #7a9438;
- border-top: 0;
- border-right: 0;
- border-bottom: 1px solid #7a9438;
- border-left: 0;
+ color: #fff;
+ background: #7a9438;
+ border-top: 0;
+ border-right: 0;
+ border-bottom: 1px solid #7a9438;
+ border-left: 0;
}
-
#nav li li a {
- background: #fff;
- color: #7a9438;
- border-top: 0;
- border-right: 0;
- border-bottom: 1px solid #7a9438;
- border-left: 0;
+ background: #fff;
+ color: #7a9438;
+ border-top: 0;
+ border-right: 0;
+ border-bottom: 1px solid #7a9438;
+ border-left: 0;
}
-
-#nav a:hover,
-#nav a:active {
- background: #9ebf47;
+#nav a:hover, #nav a:active {
+ background: #9ebf47;
}
-
#top-menu {
- background-color:#7a9438;
- border-top: 3px solid #9ebf47;
- border-bottom: 3px solid #9ebf47;
+ background-color:#7a9438;
+ border-top: 3px solid #9ebf47;
+ border-bottom: 3px solid #9ebf47;
}
-
#top-menu tr {
- padding: 0;
- margin: 0;
+ padding: 0;
+ margin: 0;
}
-
#top-menu td {
- padding: 0;
- margin: 0;
+ padding: 0;
+ margin: 0;
}
-
#search {
- padding: 0 1em 0 1em;
- margin: 0;
+ padding: 0 1em 0 1em;
+ margin: 0;
}
#search .form-text, #search .form-submit {
- padding: 0;
- margin: 0;
- font-size: 0.85em;
- border: 1px solid #7a9438;
+ padding: 0;
+ margin: 0;
+ font-size: 0.85em;
+ border: 1px solid #7a9438;
}
#search .form-submit {
- background-color: #9ebf47;
+ background-color: #9ebf47;
}
#search .form-text {
- width: 8em;
- padding: 0;
- margin: 0;
+ width: 8em;
+ padding: 0;
+ margin: 0;
}
-
#sidebar-left, #sidebar-right {
- width: 260px;
- /* padding in px not ex because IE messes up 100% width tables otherwise */
- padding: 15px 5px 75px 10px;
- vertical-align: top;
+ width: 260px;
+ /* padding in px not ex because IE messes up 100% width tables otherwise */
+ padding: 15px 5px 75px 10px;
+ vertical-align: top;
}
#sidebar-left li, #sidebar-right li {
- font-size: 1em;
+ font-size: 1em;
}
.sidebar-title {
- margin: 5px 0px 0px 0px;
- padding: 1px 5px 1px 30px;
- font-size: 1.2em;
- font-weight: 700;
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
- color: #000;
- background-color: #eee;
- font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+ margin: 5px 0px 0px 0px;
+ padding: 1px 5px 1px 30px;
+ font-size: 1.2em;
+ font-weight: 700;
+ border-top-left-radius: 5px;
+ border-top-right-radius: 5px;
+ color: #000;
+ background-color: #eee;
+ font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
}
#content {
- table-layout:fixed;
+ table-layout:fixed;
}
.block h2 {
- margin: 5px 0px 0px 0px;
- padding: 1px 5px 1px 30px;
- font-size: 1.2em;
- font-weight: 700;
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
- color: #000;
- background-color: #eee;
-}
-
+ margin: 5px 0px 0px 0px;
+ padding: 1px 5px 1px 30px;
+ font-size: 1.2em;
+ font-weight: 700;
+ border-top-left-radius: 5px;
+ border-top-right-radius: 5px;color: #000;
+ background-color: #eee;
+}
.block .content {
- border-bottom-right-radius: 5px;
- border-bottom-left-radius: 5px;
- margin-bottom: 10px;
- background-color: #fff;
- border: 1px solid #eee;
+ border-bottom-right-radius: 5px;
+ border-bottom-left-radius: 5px;
+ margin-bottom: 10px;background-color: #fff;
+ border: 1px solid #eee;
}
-
#main {
- padding-left: 10px;
- padding-right: 10px;
- padding-bottom: 10px;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-bottom: 10px;
}
-
.content {
- padding-top: 0px;
+ padding-top: 0px;
}
-
#footer-menu td {
- padding-top: 3px;
+ padding-top: 3px;
}
-
.footer {
- text-align: center;
- margin-top: 3pt;
- margin-bottom: 3pt;
- font-size: 85%;
+ text-align: center;
+ margin-top: 3pt;
+ margin-bottom: 3pt;
+ font-size: 85%;
}
-
table.tableblock {
border-collapse: collapse;
width: 90%;
@@ -260,28 +243,23 @@ table.tableblock {
margin-top: 10px;
margin-bottom: 10px;
}
-
table.tableblock thead {
- background-color: #DEE4CD;
- border: 1px solid #7A9437;
+ background-color: #DEE4CD;
+ border: 1px solid #7A9437;
}
-
table.tableblock th {
- font-family: monospace;
- border: 1px solid #7A9437;
- padding: 5px;
+ font-family: monospace;
+ border: 1px solid #7A9437;
+ padding: 5px;
}
-
table.tableblock tbody {
background-color: #FFFFFF;
border: 1px solid #7A9437;
}
-
table.tableblock td {
border: 1px dotted #7A9437;
padding: 5px;
}
-
table.tableblock td p:last-child {
margin: 0px;
}
@@ -291,7 +269,6 @@ table.tableblock .halign-center {
table.tableblock .valign-middle {
vertical-align: middle;
}
-
.note {
padding: 15px;
border-style:solid;
@@ -300,15 +277,12 @@ table.tableblock .valign-middle {
background-color: #FCFCCA;
margin: 10px;
}
-
.note .title {
- display:none;
+ display:none;
}
-
.warning:before {
content: url(../images/warning.svg)
}
-
.warning {
border-style:solid;
border-width:1px;
@@ -316,49 +290,37 @@ table.tableblock .valign-middle {
background-color: #FCFCCA;
margin: 10px;
}
-
.warning .title {
- display:none;
+ display:none;
}
-
-
#treemenu {
padding-left: 10px;
}
-
-.treeview ul{
+.treeview ul {
margin: 0;
padding: 0;
}
-
-.treeview li{
+.treeview li {
background: white url(../images/bullet.gif) no-repeat left center;
list-style-type: none;
padding-left: 22px;
margin-bottom: 3px;
}
-
.treeview li.submenu {
background: white url(../images/closed.gif) no-repeat left 1px;
}
-
.treeview .hitarea {
cursor: pointer;
}
-
.treeview li.collapsable, .treeview li.open {
background: white url(../images/open.gif) no-repeat left 1px;
}
-
-
.treeview ul.closed {
display: none;
}
-
-.treeview .submenu ul li{
+.treeview .submenu ul li {
cursor: default;
}
-
#book #title {
margin: 15px;
padding: 10px;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/terminology.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/terminology.adoc b/asciidoc/terminology.adoc
index 49d94de..f5cee6f 100644
--- a/asciidoc/terminology.adoc
+++ b/asciidoc/terminology.adoc
@@ -92,7 +92,7 @@ An artifact is _a single file_ ready for delivery with the publication of a modu
Compressed package formats are often preferred because they are easier to manage, transfer and store. For the same reasons, only one or a few artifacts per module are commonly used. However, artifacts can be of any file type and any number of them can be declared in a single module.
-In the Java world, common artifacts are Java archives or JAR files. In many cases, each revision of a module publishes only one artifact (like jakarta-log4j-1.2.6.tar.gz, for instance), but some of them publish many artifacts dependending on the use of the module (like apache-ant binary and source distributions in zip, gz and bz2 package formats, for instance).
+In the Java world, common artifacts are Java archives or JAR files. In many cases, each revision of a module publishes only one artifact (like jakarta-log4j-1.2.6.tar.gz, for instance), but some of them publish many artifacts depending on the use of the module (like apache-ant binary and source distributions in zip, gz and bz2 package formats, for instance).
__Examples: ant-1.7.0-bin.zip, apache-ant-1.7.0-src.tar.gz __
@@ -141,20 +141,20 @@ A module's status indicates how stable a module revision can be considered. It c
Three statuses are defined by default in Ivy:
-* *integration*: revisions builded by a continuous build, a nightly build, and so on, fall in this category +
+* *integration*: revisions built by a continuous build, a nightly build, and so on, fall in this category +
* *milestone*: revisions delivered to the public but not actually finished fall in this category +
* *release*: a revision fully tested and labelled fall in this category +
-*__Since 1.4__* This list is link:configuration/statuses.html[configurable] in your settings file.
+*__Since 1.4__* This list is link:settings/statuses.html[configurable] in your settings file.
== [[configurations]]Configurations of a module
A _module configuration_ is a way to use or construct a module. If the same module has different dependencies based on how it's used, those distinct dependency-sets are called its configurations in Ivy.
Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server).
-Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those different ways to use or build a module are called module configurations in ivy.
+Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those different ways to use or build a module are called module configurations in ivy.
For more details on configurations and how they are used in ivy, please refer to the link:concept.html[main concepts page].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/textual.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/textual.adoc b/asciidoc/textual.adoc
index 5b1bd83..f9144ae 100644
--- a/asciidoc/textual.adoc
+++ b/asciidoc/textual.adoc
@@ -103,7 +103,7 @@ module C revision 2.5 depends on module D with the version constraint [1.0,1.6].
-As you can see, using text conventions is much more concise.
+As you can see, using text conventions is much more concise.
Another benefit is that these conventions are usually used in Ivy console output, and can also be used in some cases to be parsed into Ivy objects (we use it for test cases for instance). To make sure text parsing works fine, we recommend using only a limited range of characters for each attributes of your module identifiers.
@@ -130,4 +130,3 @@ Here is the recommended characters set for each attribute:
* type +
a-z A-Z 0-9 - / . _ + =
-
[4/6] ant-ivy git commit: Check spelling; fix whitespace and links;
sort entries in .gitignore
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/moreexamples.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/moreexamples.adoc b/asciidoc/moreexamples.adoc
index a5627c2..ee3b633 100644
--- a/asciidoc/moreexamples.adoc
+++ b/asciidoc/moreexamples.adoc
@@ -46,5 +46,3 @@ Johan stuyts, the author of SAnt, also contributed a nice article on his view of
Apache Ivy - Beginners Guide is a step by step guide to assist beginners in understanding basic concepts/tasks and use them straight away in their projects either through Ant build or in Eclipse IDE.
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi.adoc b/asciidoc/osgi.adoc
index 94d8b43..34ca660 100644
--- a/asciidoc/osgi.adoc
+++ b/asciidoc/osgi.adoc
@@ -26,13 +26,13 @@ Since Apache Ivy™ 2.3, some support for OSGi™ dependency management ha
WARNING: Note that this feature is considered as *experimental*. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discuss your use case on the link:http://ant.apache.org/ivy/mailing-lists.html[ivy-user] mailing list, or discuss about implementation issues or improvement you may have found, on link:http://ant.apache.org/ivy/mailing-lists.html[ant-dev].
-So with a standard ivy.xml, you can express some dependency on some OSGi bundle and every of their trasitive dependencies will be resolved. You can also declare in your ivy.xml some OSGi dependency, like a `Require-Bundle`, an `Import-Package` or an `Import-Service`, miming an OSGi MANIFEST.MF.
+So with a standard ivy.xml, you can express some dependency on some OSGi bundle and every of their transitive dependencies will be resolved. You can also declare in your ivy.xml some OSGi dependency, like a `Require-Bundle`, an `Import-Package` or an `Import-Service`, miming an OSGi MANIFEST.MF.
== Note on the implementation
-With OSGi we can declare different kind of capabilites of a bundle which can match different kind of requirements of some other bundles (`Require-Bundle`/`Bundle-SymbolicName`, `Import-Package`/`Export-Package`, `Import-Service`/`Export-Service`). In Ivy we only have one kind of requirement and one kind of capability: the symbolic name of the bundle. Due to that restriction Ivy may not resolve exactly how we would expect with OSGi. The runtime of Ivy won't be as smart as a pure OSGi dependency manager. But we think that the mapping is working for most of the use cases involing OSGi dependencies management.
+With OSGi we can declare different kind of capabilities of a bundle which can match different kind of requirements of some other bundles (`Require-Bundle`/`Bundle-SymbolicName`, `Import-Package`/`Export-Package`, `Import-Service`/`Export-Service`). In Ivy we only have one kind of requirement and one kind of capability: the symbolic name of the bundle. Due to that restriction Ivy may not resolve exactly how we would expect with OSGi. The runtime of Ivy won't be as smart as a pure OSGi dependency manager. But we think that the mapping is working for most of the use cases involving OSGi dependencies management.
Details on the mapping of the OSGi dependency model into Ivy's one can be found in that link:osgi/osgi-mapping.html[page].
@@ -42,7 +42,7 @@ Details on the mapping of the OSGi dependency model into Ivy's one can be found
Since the nature of the OSGi dependencies, resolving against a repository cannot be started before acquiring the metadata of every bundle of the repository. To resolve an `Import-Package`, Ivy has to find every bundle which has the proper `Export-Package`. So unlike the usual Ivy resolvers, the OSGi capable ones have to get the descriptor before starting a resolve.
-The descriptor probably being not instantanly downloaded, the descriptor is put in cache. (FIXME not implemented)
+The descriptor probably being not instantly downloaded, the descriptor is put in cache. (FIXME not implemented)
== Use cases
@@ -50,10 +50,9 @@ The descriptor probably being not instantanly downloaded, the descriptor is put
Here are different use case of using the OSGi capabilities of Ivy:
-
+
* link:osgi/eclipse-plugin.html[building an Eclipse™ plugin] +
-
+
* link:osgi/standard-osgi.html[building a standard OSGi bundle] +
-
-* link:osgi/target-platform.html[managing a "target" platform] +
+* link:osgi/target-platform.html[managing a "target" platform] +
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi/eclipse-plugin.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi/eclipse-plugin.adoc b/asciidoc/osgi/eclipse-plugin.adoc
index d972c84..a2e8e0d 100644
--- a/asciidoc/osgi/eclipse-plugin.adoc
+++ b/asciidoc/osgi/eclipse-plugin.adoc
@@ -39,11 +39,11 @@ In few steps, we will setup a build to compile and package an Eclipse plugin.
* in the `ivysettings.properties`, specify the location of the plugins folder of your Eclipse target
- * in the `ivy.xml`, change the symbolic name declared in the extends element
+ * in the `ivy.xml`, change the symbolic name declared in the extends element
- * *__(optional)__* by default the `build.xml` is expecting the sources to be in the `src` folder. You may want to edit it if it is not the case
+ * *__(optional)__* by default the `build.xml` is expecting the sources to be in the `src` folder. You may want to edit it if it is not the case
- * *__(optional)__* if Ivy is not in Ant's classpath, link:http://ant.apache.org/ivy/download.cgi[download the Ivy jar] and edit the `build.xml` accordingly (see the comments at the begining of the file)
+ * *__(optional)__* if Ivy is not in Ant's classpath, link:http://ant.apache.org/ivy/download.cgi[download the Ivy jar] and edit the `build.xml` accordingly (see the comments at the beginning of the file)
And that's it ! Now let's use it.
@@ -91,8 +91,8 @@ NOTE: For resolution to work correctly, Ivy relies on the aggregated metadata of
When building an Eclipse plugin, we are relying on a "target platform", the Eclipse installation we want our plugin to be eventually installed into. For Ivy, this will represent the repository of artifacts.
-Ivy needs an aggragation of the OSGi metadata in order to resolve a such repository. The Ant task link:../use/buildobr.html[buildobr] builds a OBR (OSGi Bundle Repository) descriptor file from a set of OSGi bundles. So here we are using this Ant task to gather OSGi metadata from the Eclipse plugins in the "target platform". In the above example, the file is built in `target/repo-eclipse.xml`.
+Ivy needs an aggregation of the OSGi metadata in order to resolve a such repository. The Ant task link:../use/buildobr.html[buildobr] builds a OBR (OSGi Bundle Repository) descriptor file from a set of OSGi bundles. So here we are using this Ant task to gather OSGi metadata from the Eclipse plugins in the "target platform". In the above example, the file is built in `target/repo-eclipse.xml`.
-The plugin to be built has a `ivy.xml` file describing its depedencies to be used by Ivy. Since the actual depedencies are in the `MANIFEST.MF` file, in the `ivy.xml` file we specify that it extends `META-INF/MANIFEST.MF`. So there not much dependencies specified in the `ivy.xml`. But as Ivy doesn't support the `Bundle-Fragment` OSGi feature, the `ivy.xml` can help specify the missing dependencies.
+The plugin to be built has a `ivy.xml` file describing its dependencies to be used by Ivy. Since the actual dependencies are in the `MANIFEST.MF` file, in the `ivy.xml` file we specify that it extends `META-INF/MANIFEST.MF`. So there not much dependencies specified in the `ivy.xml`. But as Ivy doesn't support the `Bundle-Fragment` OSGi feature, the `ivy.xml` can help specify the missing dependencies.
Having this setup, it is then a standard Ant+Ivy build. Ivy computes the classpath to be then used by the `javac` tasks. Note that `javac` is not aware of the OSGi metadata and is then incapable of failing to compile if private packages are accessed.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi/osgi-mapping.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi/osgi-mapping.adoc b/asciidoc/osgi/osgi-mapping.adoc
index 5d8f06d..ccba816 100644
--- a/asciidoc/osgi/osgi-mapping.adoc
+++ b/asciidoc/osgi/osgi-mapping.adoc
@@ -29,10 +29,10 @@ This page is a description of how OSGi™ dependencies are mapped into Apache
In OSGi a bundle is identified by its symbolic name. In Ivy there is a notion of organisation and module name.
-The choosen mapping is:
+The chosen mapping is:
-* The organisation is "bundle" (transitive dependencies like pakages or services have their own organisations, "package" and "service") +
+* The organisation is "bundle" (transitive dependencies like packages or services have their own organisations, "package" and "service") +
* The module name is the symbolic name +
@@ -40,12 +40,12 @@ The choosen mapping is:
[]
|=======
-| *OSGi* | *Ivy*
-| `Bundle-SymbolicName: com.acme.product.plugin`
+| *OSGi* | *Ivy*
+| `Bundle-SymbolicName: com.acme.product.plugin`
a|
[source, xml]
----
-<info organisation="bundle" module="com.acme.product.plugin" />
+<info organisation="bundle" module="com.acme.product.plugin"/>
----
|=======
@@ -62,13 +62,13 @@ When it comes to version ranges, Ivy will correctly understand fully defined ran
[]
|=======
-| *OSGi* | *Ivy*
-| `Bundle-Version: 3.3.3` | `revision="3.3.3"`
-|`Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1"`
+| *OSGi* | *Ivy*
+| `Bundle-Version: 3.3.3` | `revision="3.3.3"`
+|`Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1"`
a|
[source, xml]
----
-<dependency org="bundle" name="com.acme.product.plugin" rev="[3.2.1,)" />
+<dependency org="bundle" name="com.acme.product.plugin" rev="[3.2.1,)"/>
----
@@ -79,12 +79,12 @@ a|
== Ivy configurations
-Ivy has the concept of link:../terminology.html#configurations[module configurations]. OSGi on the other hand, doesn't have such a concept. However, Ivy defines the following configurations, when it comes to dependency mapping for OSGi:
+Ivy has the concept of link:../terminology.html#configurations[module configurations]. OSGi on the other hand, doesn't have such a concept. However, Ivy defines the following configurations, when it comes to dependency mapping for OSGi:
- * `default` : it will contain every required dependency (transitively)
+ * `default` : it will contain every required dependency (transitively)
- * `optional` : it will contain every optional dependency and every required depedency the the first degree dependencies.
+ * `optional` : it will contain every optional dependency and every required dependency the the first degree dependencies.
* `transitive-optional` : it will contain every optional dependency (optional transitively)
@@ -107,26 +107,26 @@ Exported package, are declaring capabilities of the bundle in term of package. B
First, each exported package will be declared in the ivy.xml as a configuration. The name of the configuration will start will `use_` and will end with the name of that package.
-Then each time an exported package is declared to use some other one, it will be mapped as a dependency between the Ivy configurations corresponding to those packages.
+Then each time an exported package is declared to use some other one, it will be mapped as a dependency between the Ivy configurations corresponding to those packages.
[]
|=======
-| *OSGi* | *Ivy*
-| `Export-Package: com.acme.product.plugin.utils`
+| *OSGi* | *Ivy*
+| `Export-Package: com.acme.product.plugin.utils`
a|
[source, xml]
----
-<configuration name="use_com.acme.product.plugin.utils" extends="default" />
+<configuration name="use_com.acme.product.plugin.utils" extends="default"/>
----
-| `Export-Package: com.acme.product.plugin.utils,com.acme.product.plugin.common;use:=com.acme.product.plugin.utils`
+| `Export-Package: com.acme.product.plugin.utils,com.acme.product.plugin.common;use:=com.acme.product.plugin.utils`
a|
[source, xml]
----
-<configuration name="use_com.acme.product.plugin.utils" extends="default" />
-<configuration name="use_com.acme.product.plugin.common" extends="default,use_com.acme.product.plugin.utils" />
+<configuration name="use_com.acme.product.plugin.utils" extends="default"/>
+<configuration name="use_com.acme.product.plugin.common" extends="default,use_com.acme.product.plugin.utils"/>
----
@@ -137,7 +137,7 @@ a|
== OSGi Requirements / Ivy dependencies
-In OSGi there are different kind of dependencies, which is an OSGi bundle repository documentation is called a "requirement". The problem is that Ivy undesrstands only one kind of requirement, so we use here some extra attribute to declare those different kind of dependency.
+In OSGi there are different kind of dependencies, which is an OSGi bundle repository documentation is called a "requirement". The problem is that Ivy understands only one kind of requirement, so we use here some extra attribute to declare those different kind of dependency.
=== Require-Bundle
@@ -150,20 +150,20 @@ If there is the OSGi `resolution` parameter specified to `optional`, then the de
[]
|=======
-| *OSGi* | *Ivy*
-| `Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1"`
+| *OSGi* | *Ivy*
+| `Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1"`
a|
[source, xml]
----
-<dependency osgi="bundle" org="" name="com.acme.product.plugin" rev="[3.2.1,)" conf="default->default" />
+<dependency osgi="bundle" org="" name="com.acme.product.plugin" rev="[3.2.1,)" conf="default->default"/>
----
-| `Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1";resolution:="optional"`
+| `Require-Bundle: com.acme.product.plugin;bundle-version="3.2.1";resolution:="optional"`
a|
[source, xml]
----
-<dependency org="bundle" name="com.acme.product.plugin" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional" />
+<dependency org="bundle" name="com.acme.product.plugin" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional"/>
----
@@ -183,20 +183,20 @@ As it is an import package, the configuration of the dependency will be the `use
[]
|=======
-| *OSGi* | *Ivy*
-| `Import-Package: com.acme.product.plugin.utils;version="3.2.1"`
+| *OSGi* | *Ivy*
+| `Import-Package: com.acme.product.plugin.utils;version="3.2.1"`
a|
[source, xml]
----
-<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="default->default;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils" />
+<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="default->default;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils"/>
----
-| `Import-Package: com.acme.product.plugin.utils;version="3.2.1";resolution:="optional"`
-a|
+| `Import-Package: com.acme.product.plugin.utils;version="3.2.1";resolution:="optional"`
+a|
[source, xml]
----
-<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils" />
+<dependency org="package" name="com.acme.product.plugin.utils" rev="[3.2.1,)" conf="optional->default;transitive-optional->transitive-optional;use_com.acme.product.plugin.utils->use_com.acme.product.plugin.utils"/>
----
@@ -212,16 +212,16 @@ The OSGi `Bundle-RequiredExecutionEnvironment` manifest attribute specifies whic
[]
|=======
-| *OSGi* | *Ivy*
-| `Bundle-RequiredExecutionEnvironment: JavaSE-1.6`
+| *OSGi* | *Ivy*
+| `Bundle-RequiredExecutionEnvironment: JavaSE-1.6`
a|
[source, xml]
----
<dependencies>
- <exclude org="package" module="javax.accessibility" />
- <exclude org="package" module="javax.activation" />
- <exclude org="package" module="javax.activity" />
+ <exclude org="package" module="javax.accessibility"/>
+ <exclude org="package" module="javax.activation"/>
+ <exclude org="package" module="javax.activity"/>
...
</dependencies>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi/sigil.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi/sigil.adoc b/asciidoc/osgi/sigil.adoc
index 5d78a6d..c8ede8d 100644
--- a/asciidoc/osgi/sigil.adoc
+++ b/asciidoc/osgi/sigil.adoc
@@ -50,4 +50,3 @@ The immediate consequence of this difference is that the built-in resolver is pr
Apache Felix Sigil has its own format about specifying the OSGi dependencies. Whereas Ivy requires an `ivysettings.xml` and an `ivy.xml`, Sigil requires a `sigil-repos.properties` and a `sigil.properties`. Then if you want to use the Sigil resolver in Ivy, you will need 4 files, the 2 Ivy ones and the 2 Sigil ones, as described in the Sigil quickstart link:https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Sigil+Ivy+Quickstart[here].
To support OSGi directly in Ivy, you just need to add an extra namespace in the `ivy.xml`, and in the `ivysettings.xml` just declare the proper resolver and latest revision strategy.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi/standard-osgi.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi/standard-osgi.adoc b/asciidoc/osgi/standard-osgi.adoc
index ccbc67e..a4ed555 100644
--- a/asciidoc/osgi/standard-osgi.adoc
+++ b/asciidoc/osgi/standard-osgi.adoc
@@ -35,7 +35,7 @@ It should work with simple configuration but may not in complex ones. If you hav
'''
-This page describes how to build an OSGi™ bundle with Apache Ivy™. In this use case, we just basically want to compute a classpath to compile, optionaly one for testing too, and then publish our bundle in a OSGi aware repository.
+This page describes how to build an OSGi™ bundle with Apache Ivy™. In this use case, we just basically want to compute a classpath to compile, optionally one for testing too, and then publish our bundle in a OSGi aware repository.
In oder to produce OSGi metadata of sufficient quality and to avoid maintaining them manually, the link:http://bndtools.org/[bnd] tool will be used. The approach taken is then an "Ivy file first" approach. The dependencies will be specified in the `ivy.xml` file, the `MANIFEST.MF` being generated from the computed classpath.
@@ -49,9 +49,9 @@ In few steps, we will setup a build to compile and publish an OSGi bundle.
* in the `ivysettings.properties`, specify the location of the plugins folder of your Eclipse target
- * *__(optional)__* by default the `build.xml` is expecting the sources to be in the `src` folder. You may want to edit it if it is not the case
+ * *__(optional)__* by default the `build.xml` is expecting the sources to be in the `src` folder. You may want to edit it if it is not the case
- * *__(optional)__* if Ivy is not in Ant's classpath, link:http://ant.apache.org/ivy/download.cgi[download the Ivy jar] and edit the `build.xml` accordingly (see the comments at the begining of the file)
+ * *__(optional)__* if Ivy is not in Ant's classpath, link:http://ant.apache.org/ivy/download.cgi[download the Ivy jar] and edit the `build.xml` accordingly (see the comments at the beginning of the file)
To build the project, run:
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/osgi/target-platform.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/osgi/target-platform.adoc b/asciidoc/osgi/target-platform.adoc
index ca884ce..8103170 100644
--- a/asciidoc/osgi/target-platform.adoc
+++ b/asciidoc/osgi/target-platform.adoc
@@ -28,11 +28,11 @@ It should work with simple configuration but may not in complex ones. If you hav
====
-The concept of "target platform" is a concept introduced by Eclipse™ to describe the set of bundles which will run together in an OSGi™ environement. Then when developping an OSGi bundle, we expect it to run in such a "target platform".
+The concept of "target platform" is a concept introduced by Eclipse™ to describe the set of bundles which will run together in an OSGi™ environment. Then when developing an OSGi bundle, we expect it to run in such a "target platform".
-When developping a single OSGi bundle, a single `ivy.xml` (together with the use of the link:../use/fixdeps.html[fixdeps] task) is sufficent to describe precisely the bundle requirements.
+When developing a single OSGi bundle, a single `ivy.xml` (together with the use of the link:../use/fixdeps.html[fixdeps] task) is sufficient to describe precisely the bundle requirements.
-But when developping several bundles, it will be error prone to declare for each bundle its dependencies. Because once deployed in an OSGi environement, the bindings are sensitive to the available bundles. So when developping, we must ensure that the set of bundles will be the same set as the one at deploy time.
+But when developing several bundles, it will be error prone to declare for each bundle its dependencies. Because once deployed in an OSGi environment, the bindings are sensitive to the available bundles. So when developing, we must ensure that the set of bundles will be the same set as the one at deploy time.
The concept of "target platform" is a perfect fit to describe the set of bundles to resolve against. Here is a recipe to handle it with just Ant+Ivy.
@@ -50,14 +50,12 @@ First you need a project (basically a folder) in which you will manage your targ
* and a link:../samples/target-platform/build.xml[build.xml] with which you'll manage your target platform
-In the build there is a target: `update-dependencies`. This target will do a resolve with the `ivy.xml` and will generate an `ivy-fixed.xml` from the resolved depedencies. This `ivy-fixed.xml` file contains only fixed non transitive dependencies (see the link:../use/fixdeps.html[fixdeps] task for further info). With that `ivy-fixed.xml` file, subsequent dependency resolutions are then reproducible and will always generate the same set of artifacts.
+In the build there is a target: `update-dependencies`. This target will do a resolve with the `ivy.xml` and will generate an `ivy-fixed.xml` from the resolved dependencies. This `ivy-fixed.xml` file contains only fixed non transitive dependencies (see the link:../use/fixdeps.html[fixdeps] task for further info). With that `ivy-fixed.xml` file, subsequent dependency resolutions are then reproducible and will always generate the same set of artifacts.
Once generated, it is recommended to share that `ivy-fixed.xml` file into you version control system (subversion, git, etc...). The target `update-dependencies` is then to be launched each time you edit the `ivy.xml`, when you want to change the content of your target platform.
-The second target `generate-target-platform` will generate an `obr.xml`, a OSGi Bundle repository descriptor. This file will list every artifact wich has been resolved by the `ivy-fixed.xml`. Then each of your bundles you develop will do its resolve against that `obr.xml` (see the link:../resolver/obr.html[obr resolver]).
+The second target `generate-target-platform` will generate an `obr.xml`, a OSGi Bundle repository descriptor. This file will list every artifact which has been resolved by the `ivy-fixed.xml`. Then each of your bundles you develop will do its resolve against that `obr.xml` (see the link:../resolver/obr.html[obr resolver]).
The generated `obr.xml` contains paths to the local filesystem, so it is neither recommended to share it between developers nor commit it to version control system.
If it is required to develop your plugin with the Eclipse PDE plugin, you can then use the alternative target `generate-retrieved-target-platform`. It has the same principle as the `generate-target-platform` but the artifacts are also retrieved in a single folder, just like the plugins in an Eclipse install. That way you can define your target platform within Eclipse quite easily.
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/principle.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/principle.adoc b/asciidoc/principle.adoc
index 2ea209d..8ff5dfb 100644
--- a/asciidoc/principle.adoc
+++ b/asciidoc/principle.adoc
@@ -28,21 +28,21 @@ More details on ant tasks link:ant.html[here].
== Configure
-Ivy needs to be configured to be able to resolve your dependencies. This configuration is usually done with a settings file, which defines a set of dependency resolvers. Each resolver is able to find ivy files and/or artifacts, given simple information such as organisation, module, revision, artifact name, artifact type and artifact extension.
+Ivy needs to be configured to be able to resolve your dependencies. This configuration is usually done with a settings file, which defines a set of dependency resolvers. Each resolver is able to find ivy files and/or artifacts, given simple information such as organisation, module, revision, artifact name, artifact type and artifact extension.
-The configuration is also responsible for indicating which resolver should be used to resolve which module. This configuration is dependent only on your environment, i.e. where the modules and artifacts can be found.
+The configuration is also responsible for indicating which resolver should be used to resolve which module. This configuration is dependent only on your environment, i.e. where the modules and artifacts can be found.
A default configuration is used by ivy when none is given. This configuration uses an link:resolver/ibiblio.html[ibiblio resolver] pointing to https://repo1.maven.org/maven2/ to resolve all modules.
== Resolve
-The resolve time is the moment when ivy actually resolves the dependencies of one module. It first needs to access the ivy file of the module for which it resolves the dependencies.
+The resolve time is the moment when ivy actually resolves the dependencies of one module. It first needs to access the ivy file of the module for which it resolves the dependencies.
Then, for each dependency declared in this file, it asks the appropriate resolver (according to settings) to find the module (i.e. either an ivy file for it, or its artifacts if no ivy file can be found). It also uses a filesystem based cache to avoid asking for a dependency if it is already in cache (at least if possible, which is not the case with latest revisions).
If the resolver is a composite one (i.e. a chain or a dual resolver), several resolvers may actually be called to find the module.
-When the dependency module has been found, its ivy file is downloaded to the ivy cache. Then ivy checks if the dependency module has dependencies, in which case it recursilvely traverses the graph of dependencies.
+When the dependency module has been found, its ivy file is downloaded to the ivy cache. Then ivy checks if the dependency module has dependencies, in which case it recursively traverses the graph of dependencies.
All over this traversal, conflict management is done to prevent access to a module as soon as possible.
@@ -78,4 +78,3 @@ This is done with a simple xsl transformation of the xml report generated at res
== Publish
Finally, Ivy can be used to publish a particular version of a module in your repository, so that it becomes available for future resolving. This task is usually called either manually or from a continuous integration server.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/release-notes.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc
index 1c3fee9..415e788 100644
--- a/asciidoc/release-notes.adoc
+++ b/asciidoc/release-notes.adoc
@@ -27,37 +27,37 @@
----
December 21, 2015 - The Apache Ivy project is pleased to announce its 2.5.0 release.
-
+
Apache Ivy is a tool for managing (recording, tracking, resolving and
reporting) project dependencies, characterized by flexibility,
configurability, and tight integration with Apache Ant.
Key features of this 2.5.0 release are
-* Ivy now uses BoucyCastle 1.52. Due to the non backward compatibility of that library, earlier versions are not supported.
+* Ivy now uses BouncyCastle 1.52. Due to the non backward compatibility of that library, earlier versions are not supported.
* the minimum Java version required is now Java 7
* TODO
* TODO
You can download this 2.5.0 release at:
http://ant.apache.org/ivy/download.cgi
-
+
Issues should be reported to:
https://issues.apache.org/jira/browse/IVY
-
+
More information can be found on the website:
http://ant.apache.org/ivy/
----
-
+
=== List of Changes in this Release
-
-For details about the following changes, check our JIRA install at
+
+For details about the following changes, check our JIRA install at
http://issues.apache.org/jira/browse/ivy
-
+
List of changes since Ivy 2.4.0:
- FIX: Made the maven 'test' configuration public so we can use the test-jar as dependency (link:https://issues.apache.org/jira/browse/IVY-1444[IVY-1444])
@@ -390,5 +390,3 @@ Contributors:
* Aleksey Zhukov +
* Zhong Wang +
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/bintray.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/bintray.adoc b/asciidoc/resolver/bintray.adoc
index 8f99267..dd1d5c5 100644
--- a/asciidoc/resolver/bintray.adoc
+++ b/asciidoc/resolver/bintray.adoc
@@ -48,11 +48,11 @@ This resolver uses Bintray DaaS (Distribution as a Service) platform to retrieve
[source]
----
-<bintray />
+<bintray/>
----
-A default, defines a link:https://bintray.com/bintray/jcenter[JCenter] bintray resolver.
+A default, defines a link:https://bintray.com/bintray/jcenter[JCenter] bintray resolver.
In most circumstances you won't need any other resolvers as JCenter is already a super-set of many other repositories, including Maven Central.
@@ -68,5 +68,5 @@ In most circumstances you won't need any other resolvers as JCenter is already a
----
-Defines two resolvers to use a link:https://bintray.com/dsowerby/maven[repository] "maven" of user "dsowerby" (https://dl.bintray.com/dsowerby/maven/)
+Defines two resolvers to use a link:https://bintray.com/dsowerby/maven[repository] "maven" of user "dsowerby" (https://dl.bintray.com/dsowerby/maven/)
and link:https://bintray.com/igelgrun/batrak[repository] "batrak" of user "igelgrun" (https://dl.bintray.com/igelgrun/batrak/).
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/chain.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/chain.adoc b/asciidoc/resolver/chain.adoc
index 2e894c4..b3fb992 100644
--- a/asciidoc/resolver/chain.adoc
+++ b/asciidoc/resolver/chain.adoc
@@ -104,4 +104,3 @@ Same as before, except that if a revision is found in the filesystem then ivyrep
----
Same as first example, except that once a module is found by either filesystem or ivyrep, then it's the whole chain which will be queried to download the artifacts. So in this case ivy file and artifacts may be split across the two resolvers for the same module.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/dual.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/dual.adoc b/asciidoc/resolver/dual.adoc
index f2a944c..891d00c 100644
--- a/asciidoc/resolver/dual.adoc
+++ b/asciidoc/resolver/dual.adoc
@@ -43,5 +43,3 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute
|Element|Description|Cardinality
|any resolver|two resolvers, the first being the ivy resolver, the second the artifact resolver|2
|=======
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/filesystem.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/filesystem.adoc b/asciidoc/resolver/filesystem.adoc
index 6d13cfc..6887aa0 100644
--- a/asciidoc/resolver/filesystem.adoc
+++ b/asciidoc/resolver/filesystem.adoc
@@ -39,7 +39,7 @@ The configuration of such a resolver is mainly done through ivy and artifact pat
== Atomic publish support
*__since 2.0__* This resolver supports atomic publish, which is useful for environments with a lot of concurrent publish and resolve actions. The atomic publish relies on the atomicity of the rename operation in the underlying filesystem (which includes NTFS and POSIX based filesystems).
-In this case the resolver starts by publishing the module according to the pattern, but where a `.part` suffix is appended to the revision. Then the publish is committed with a rename to the final location.
+In this case the resolver starts by publishing the module according to the pattern, but where a `.part` suffix is appended to the revision. Then the publish is committed with a rename to the final location.
*Limitations*
Atomic publish is currently limited in several ways:
@@ -88,5 +88,3 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute
|ivy|defines a pattern for ivy files, using the pattern attribute|0..n
|artifact|defines a pattern for artifacts, using the pattern attribute|1..n
|=======
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/ibiblio.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/ibiblio.adoc b/asciidoc/resolver/ibiblio.adoc
index 73049bc..4dd4ed0 100644
--- a/asciidoc/resolver/ibiblio.adoc
+++ b/asciidoc/resolver/ibiblio.adoc
@@ -27,7 +27,7 @@
|=======
-This resolver usually uses ibiblio to find artifacts.
+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.
@@ -87,4 +87,3 @@ Defines a resolver called `maven2` using the Maven2 public repository to find mo
----
Same as above, but doesn't use poms, only artifacts.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/jar.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/jar.adoc b/asciidoc/resolver/jar.adoc
index 9eef6c4..9f2ecb7 100644
--- a/asciidoc/resolver/jar.adoc
+++ b/asciidoc/resolver/jar.adoc
@@ -67,8 +67,8 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute
----
<jar name="my-local-jar-resolver" file="/home/me/myrepo.jar">
- <ivy pattern="[organisation]/[module]/ivys/ivy-[revision].xml" />
- <artifact pattern="[organisation]/[module]/[type]s/[artifact]-[revision].[type]" />
+ <ivy pattern="[organisation]/[module]/ivys/ivy-[revision].xml"/>
+ <artifact pattern="[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
</jar>
----
@@ -82,14 +82,13 @@ A simple local jar repository.
----
<jar name="my-remote-jar-resolver" url="http://www.mywebsite.com/dist/myrepo.jar">
- <ivy pattern="dir_in_jar/subdir_in_jar/[organisation]/[module]/ivys/ivy-[revision].xml" />
- <ivy pattern="dir_in_jar/another_subdir_in_jar/[organisation]/[module]/ivys/ivy-[revision].xml" />
- <artifact pattern="dir_in_jar/subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]" />
- <artifact pattern="dir_in_jar/another_subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]" />
- <artifact pattern="dir_in_jar/yet_another_subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]" />
+ <ivy pattern="dir_in_jar/subdir_in_jar/[organisation]/[module]/ivys/ivy-[revision].xml"/>
+ <ivy pattern="dir_in_jar/another_subdir_in_jar/[organisation]/[module]/ivys/ivy-[revision].xml"/>
+ <artifact pattern="dir_in_jar/subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
+ <artifact pattern="dir_in_jar/another_subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
+ <artifact pattern="dir_in_jar/yet_another_subdir_in_jar/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
</jar>
----
A remote jar repository with multiple ivy and artifact patterns, patterns pointing in some sub directories in the jar.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/mirrored.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/mirrored.adoc b/asciidoc/resolver/mirrored.adoc
index c646aa4..129ad59 100644
--- a/asciidoc/resolver/mirrored.adoc
+++ b/asciidoc/resolver/mirrored.adoc
@@ -40,7 +40,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute
|=======
|Attribute|Description|Required
|m2compatible|True if this resolver should be maven2 compatible, false otherwise|No, defaults to false
-|mirrorListUrl|The url where to retrive the list of mirror urls.|Yes
+|mirrorListUrl|The url where to retrieve the list of mirror urls.|Yes
|=======
@@ -75,7 +75,7 @@ And the piece of settings:
----
<mirroredurl name="mirrored-maven" m2compatible="true" mirrorListUrl="file:///Users/me/dev/repo/mavenrepolist.txt">
- <artifact pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
+ <artifact pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
</mirroredurl>
----
@@ -92,9 +92,8 @@ The mirror list can be retrieved from a geo-location aware url:
----
<mirroredurl name="mirrored-asf" mirrorListUrl="http://www.apache.org/dyn/closer.cgi">
- <ivy pattern="repo/[organisation]/[module]/[revision]/ivy.xml" />
- <artifact pattern="repo/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
+ <ivy pattern="repo/[organisation]/[module]/[revision]/ivy.xml"/>
+ <artifact pattern="repo/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
</mirroredurl>
----
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/obr.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/obr.adoc b/asciidoc/resolver/obr.adoc
index 1661a8d..4f4d2a0 100644
--- a/asciidoc/resolver/obr.adoc
+++ b/asciidoc/resolver/obr.adoc
@@ -50,7 +50,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute
The requirement strategy is defining how the resolver should behave in front of several choices. In the OSGi dependency model, an `Import-Package` requirement can be satisfied by several different bundles. So when resolving such requirement, Ivy will first look into the already resolved bundles if one provides that package. If it fails to find one, then two behaviours can occur:
- * if the requirement strategy is `first`, among the bundles statifying the requirement, it will shoose the first one. A warn will be logged ahout the choice Ivy has to arbitrarily do. +
+ * if the requirement strategy is `first`, among the bundles satisfying the requirement, it will choose the first one. A warning will be logged about the choice Ivy has to arbitrarily do. +
* if the requirement strategy is `noambiguity`, Ivy will make the resolution fail. +
@@ -62,7 +62,7 @@ The requirement strategy is defining how the resolver should behave in front of
[source, xml]
----
-<obr name="felix-repo" repoXmlURL="http://felix.apache.org/obr/releases.xml" />
+<obr name="felix-repo" repoXmlURL="http://felix.apache.org/obr/releases.xml"/>
----
@@ -74,9 +74,8 @@ A simple repository configured to use the Felix OBR.
[source, xml]
----
-<obr name="my-osgi-repo" repoXmlFile="${ivy.settings.dir}/obr/obr.xml" requirementStrategy="first" />
+<obr name="my-osgi-repo" repoXmlFile="${ivy.settings.dir}/obr/obr.xml" requirementStrategy="first"/>
----
A local repository which is trusted to always provide correct dependency for the `Import-Package` requirements.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/osgiagg.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/osgiagg.adoc b/asciidoc/resolver/osgiagg.adoc
index bb3afbd..5c6275b 100644
--- a/asciidoc/resolver/osgiagg.adoc
+++ b/asciidoc/resolver/osgiagg.adoc
@@ -50,14 +50,13 @@ As sub element, this resolver accept any kind of OSGi resolver: link:../resolver
[source, xml]
----
-<updatesite name="ivyde-updatesite" url="http://www.apache.org/dist/ant/ivyde/updatesite" />
-<obr name="felix-repo" repoXmlURL="http://felix.apache.org/obr/releases.xml" />
+<updatesite name="ivyde-updatesite" url="http://www.apache.org/dist/ant/ivyde/updatesite"/>
+<obr name="felix-repo" repoXmlURL="http://felix.apache.org/obr/releases.xml"/>
<osgi-agg name="all-osgi">
- <resolver ref="ivyde-updatesite" />
- <resolver ref="felix-repo" />
+ <resolver ref="ivyde-updatesite"/>
+ <resolver ref="felix-repo"/>
</osgi-agg>
----
-An aggregated OSGi reporsory composed of the Apache IvyDE Eclipse update site and the Felix OBR.
-
+An aggregated OSGi repository composed of the Apache IvyDE Eclipse update site and the Felix OBR.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/packager.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/packager.adoc b/asciidoc/resolver/packager.adoc
index 50ee6e9..b4e4c0d 100644
--- a/asciidoc/resolver/packager.adoc
+++ b/asciidoc/resolver/packager.adoc
@@ -39,10 +39,10 @@ The Packager resolver supports a "resource cache", where downloaded archives can
The packaging instructions are contained in "packager.xml" in a simple XML format. At resolve time this file gets converted into a "build.xml" file via XSLT and then executed using link:https://ant.apache.org/[Ant]. Therefore, Ant must be available as an executable on the platform. The ant task executes in a separate ant project and so is not affected by properties, etc. that may be set in any existing ant environment in which Ivy is running. However, Ivy will define a few properties for convenience; see the "Properties" listed below.
-For security reasons, the XSLT transform ensures that
+For security reasons, the XSLT transform ensures that
+
+ a. all downloaded archives have verified SHA1 checksums (including cached resources); and
- a. all downloaded archives have verified SHA1 checksums (including cached resources); and
-
b. only a very limited set of ant tasks can be performed during the artifact "build" phase; currently these include move, copy, mkdir, zip, unzip, tar, and untar (this restriction may be overridden however; see below).
@@ -104,22 +104,22 @@ Configure a resourceURL in situations where you don't want to rely on (or wait f
----
-Defines a packager resolver which points to the `http://ivyroundup.googlecode.com/` online repository. Builds will occur in a subdirectory of
+Defines a packager resolver which points to the `http://ivyroundup.googlecode.com/` online repository. Builds will occur in a subdirectory of
[source]
----
${user.home}/.ivy2/packager/build
----
-downloaded resources will be cached in
+downloaded resources will be cached in
[source]
----
${user.home}/.ivy2/packager/cache
----
-and the mirror site
+and the mirror site
[source]
----
-ftp://mirror.example.com/pub/resources/[organisation]/[module]/
+ftp://mirror.example.com/pub/resources/[organisation]/[module]/
----
will be tried first for all resources.
@@ -259,7 +259,7 @@ The m2resource XML tag supports the following attributes:
|groupId|Maven group ID|No; defaults to ${ivy.packager.organisation}
|artifactId|Maven artifact ID|No; defaults to ${ivy.packager.module}
|version|Maven version|No; defaults to ${ivy.packager.revision}
-|repo|Maven repository URL|No; defaults to https://repo1.maven.org/maven2/
+|repo|Maven repository URL|No; defaults to https://repo1.maven.org/maven2/
|=======
@@ -299,4 +299,3 @@ Below is an example of packaging instructions for the link:http://commons.apache
</packager-module>
----
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/sftp.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/sftp.adoc b/asciidoc/resolver/sftp.adoc
index b93fda2..9012b7c 100644
--- a/asciidoc/resolver/sftp.adoc
+++ b/asciidoc/resolver/sftp.adoc
@@ -28,7 +28,7 @@
*__since 1.4__*
-This resolver can be used when your ivy repository is located on a server accessible via sftp. The secured nature of sftp and its widespread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment.
+This resolver can be used when your ivy repository is located on a server accessible via sftp. The secured nature of sftp and its widespread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment.
If your server supports ssh but not sftp, there is also an link:../resolver/ssh.html[ssh resolver].
@@ -42,7 +42,7 @@ e.g. pattern="sftp://user:geheim@myserver.com:8022/path/to/my/repos/[artifact].[
-Note that the authentication features of this resolver are exactly the same as the ssh resolver. Choosing between the two is often a matter of server implementation. If your server supports sftp, usually it's preferrable.
+Note that the authentication features of this resolver are exactly the same as the ssh resolver. Choosing between the two is often a matter of server implementation. If your server supports sftp, usually it's preferable.
Internally this resolver relies on link:http://www.jcraft.com/jsch/[jsch] as ssh client, which is a popular java ssh client, used for example in Eclipse.
@@ -86,7 +86,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute
<sftp user="myuser" host="myhost.com">
<ivy pattern="/path/to/ivy/[module]/ivy.xml"/>
<artifact pattern="/path/to/[organisation]/[module]/[artifact].[ext]"/>
-</sftp>
+</sftp>
----
@@ -149,4 +149,3 @@ Will connect to yourserver.com on port 8022 with user 'user' and use keyFile `pa
----
Will connect to the host named by myhost according to the config file in `/path/to/.ssh/config`, using the hostname, username, and optionally IdentityFile specified in the config section "Host myhost". For example, if the corresponding Host section contains "Hostname yourserver.com" and "User myremoteusername", it will connect to yourserver.com using username myremoteusername.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/ssh.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/ssh.adoc b/asciidoc/resolver/ssh.adoc
index 8e7021b..8c65e09 100644
--- a/asciidoc/resolver/ssh.adoc
+++ b/asciidoc/resolver/ssh.adoc
@@ -28,7 +28,7 @@
*__since 1.4__*
-This resolver can be used when your ivy repository is located on a server accessible via ssh. The secured nature of ssh and its widespread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment.
+This resolver can be used when your ivy repository is located on a server accessible via ssh. The secured nature of ssh and its widespread implementation on most *nix servers makes this resolver a very good candidate in an enterprise environment.
If your server supports sftp, you can consider using the link:../resolver/sftp.html[sftp resolver].
@@ -75,7 +75,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute
<ssh user="myuser" host="myhost.com">
<ivy pattern="/path/to/ivy/[module]/ivy.xml"/>
<artifact pattern="/path/to/[organisation]/[module]/[artifact].[ext]"/>
-</ssh>
+</ssh>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/updatesite.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/updatesite.adoc b/asciidoc/resolver/updatesite.adoc
index c821360..d8c977e 100644
--- a/asciidoc/resolver/updatesite.adoc
+++ b/asciidoc/resolver/updatesite.adoc
@@ -52,7 +52,7 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute
The requirement strategy is defining how the resolver should behave in front of several choices. In the OSGi dependency model, an `Import-Package` requirement can be satisfied by several different bundles. So when resolving such requirement, Ivy will first look into the already resolved bundles if one provides that package. If it fails to find one, then two behaviours can occur:
- * if the requirement strategy is `first`, among the bundles statifying the requirement, it will shoose the first one. A warn will be logged ahout the choice Ivy has to arbitrarily do. +
+ * if the requirement strategy is `first`, among the bundles satisfying the requirement, it will choose the first one. A warning will be logged about the choice Ivy has to arbitrarily do. +
* if the requirement strategy is `noambiguity`, Ivy will make the resolution fail. +
@@ -64,7 +64,7 @@ The requirement strategy is defining how the resolver should behave in front of
[source, xml]
----
-<updatesite name="ivyde-updatesite" url="http://www.apache.org/dist/ant/ivyde/updatesite" />
+<updatesite name="ivyde-updatesite" url="http://www.apache.org/dist/ant/ivyde/updatesite"/>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/url.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/url.adoc b/asciidoc/resolver/url.adoc
index acec61b..62965a1 100644
--- a/asciidoc/resolver/url.adoc
+++ b/asciidoc/resolver/url.adoc
@@ -62,9 +62,9 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute
----
<url name="two-patterns-example">
- <ivy pattern="http://ivyrep.mycompany.com/[module]/[revision]/ivy-[revision].xml" />
- <artifact pattern="http://ivyrep.mycompany.com/[module]/[revision]/[artifact]-[revision].[ext]" />
- <artifact pattern="http://ivyrep.mycompany.com/[module]/[revision]/[artifact].[ext]" />
+ <ivy pattern="http://ivyrep.mycompany.com/[module]/[revision]/ivy-[revision].xml"/>
+ <artifact pattern="http://ivyrep.mycompany.com/[module]/[revision]/[artifact]-[revision].[ext]"/>
+ <artifact pattern="http://ivyrep.mycompany.com/[module]/[revision]/[artifact].[ext]"/>
</url>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/resolver/vfs.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/resolver/vfs.adoc b/asciidoc/resolver/vfs.adoc
index 068b879..ba55e3b 100644
--- a/asciidoc/resolver/vfs.adoc
+++ b/asciidoc/resolver/vfs.adoc
@@ -52,11 +52,10 @@ This resolver shares the link:../settings/resolvers.html#common[common attribute
----
<vfs name="vfs-resolver">
- <ivy pattern="sftp://username:password@host/[organisation]/[module]/[revision]/ivy.xml" />
- <artifact pattern="sftp://username:password@host/[organisation]/[module]/[revision]/[artifact].[ext]" />
-</vfs>
+ <ivy pattern="sftp://username:password@host/[organisation]/[module]/[revision]/ivy.xml"/>
+ <artifact pattern="sftp://username:password@host/[organisation]/[module]/[revision]/[artifact].[ext]"/>
+</vfs>
----
Access ivy and artifacts files using sftp.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/running.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/running.adoc b/asciidoc/running.adoc
index 3e39744..bad9278 100644
--- a/asciidoc/running.adoc
+++ b/asciidoc/running.adoc
@@ -18,7 +18,7 @@
////
Ivy is sending http headers when downloading files.
- The User-Agent http header can be controlled using a
+ The User-Agent http header can be controlled using a
[source]
----
http.agent
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/apache-hello-ivy-default.html
----------------------------------------------------------------------
diff --git a/asciidoc/samples/apache-hello-ivy-default.html b/asciidoc/samples/apache-hello-ivy-default.html
index edb4488..4a0707b 100644
--- a/asciidoc/samples/apache-hello-ivy-default.html
+++ b/asciidoc/samples/apache-hello-ivy-default.html
@@ -14,7 +14,7 @@
"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 License.
+ under the License.
-->
<html>
<head>
@@ -30,12 +30,12 @@
<a href="http://ant.apache.org/ivy/"><img src="http://ant.apache.org/ivy/images/logo.png"></a>
</div>
<h1>
-<a name="apache-hello-ivy"></a><span id="module">hello-ivy</span>
- by
+<a name="apache-hello-ivy"></a><span id="module">hello-ivy</span>
+ by
<span id="organisation">apache</span>
</h1>
<div id="date">
- resolved on
+ resolved on
2007-10-21 17:24:25</div>
<ul id="confmenu">
<li>
@@ -49,14 +49,14 @@
<td class="title">Modules</td><td class="value">3</td>
</tr>
<tr>
-<td class="title">Revisions</td><td class="value">4
+<td class="title">Revisions</td><td class="value">4
(0 searched <img src="http://ivy.jayasoft.org/images/searched.gif" alt="searched" title="module revisions which required a search with a dependency resolver to be resolved">,
0 downloaded <img src="http://ivy.jayasoft.org/images/downloaded.gif" alt="downloaded" title="module revisions for which ivy file was downloaded by dependency resolver">,
1 evicted <img src="http://ivy.jayasoft.org/images/evicted.gif" alt="evicted" title="module revisions which were evicted by others">,
0 errors <img src="http://ivy.jayasoft.org/images/error.gif" alt="error" title="module revisions on which error occurred">)</td>
</tr>
<tr>
-<td class="title">Artifacts</td><td class="value">3
+<td class="title">Artifacts</td><td class="value">3
(0 downloaded,
0 failed)</td>
</tr>
@@ -288,7 +288,7 @@
0 kB in cache)</td>
</tr>
<tr>
-<td class="title">Evicted by</td><td class="value">2.0
+<td class="title">Evicted by</td><td class="value">2.0
in <b>latest-revision</b> conflict manager
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/build-install.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/build-install.xml b/asciidoc/samples/build-install.xml
index 8f7183a..39df71c 100644
--- a/asciidoc/samples/build-install.xml
+++ b/asciidoc/samples/build-install.xml
@@ -14,32 +14,32 @@
"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 License.
+ under the License.
-->
<!--
This build script is used to download dependencies for a freshly downloaded
binary distribution of Ivy without dependencies.
-
+
To use it, you only need to have this script in the directory where you
have unzipped your binary distribution of Ivy, and to call it using
ant -f build-install.xml
-
+
If you don't want to download all optional dependencies, you can set
the conf attribute value in the ivy:retrieve task, to select only
the configuration you want (check the ivy.xml for details about
which configurations are available, and what they are useful for).
-->
-<project name="ivy-bin-install" default="download-deps"
+<project name="ivy-bin-install" default="download-deps"
xmlns:ivy="antlib:org.apache.ivy.ant">
<target name="init-ivy-settings">
<echo file="${basedir}/ivysettings.xml">
<![CDATA[
<ivysettings>
<include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
- <settings defaultResolver="public" />
+ <settings defaultResolver="public"/>
<resolvers>
- <!--
+ <!--
we use ivyrep for ivy and some artifacts, and ibiblio for other artifacts
The reason for that is that commons vfs is still not released, thus we depend on an integration
version only available on ivyrep, but not on ivyrep
@@ -52,10 +52,10 @@
</url>
</resolvers>
</ivysettings>
- ]]>
+ ]]>
</echo>
</target>
-
+
<target name="init-ivy" depends="init-ivy-settings">
<path id="ivy.lib.path">
<fileset dir="${basedir}" includes="*.jar" excludes="ivy-core-*.jar"/>
@@ -63,10 +63,10 @@
<taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
</target>
-
+
<target name="download-deps" depends="init-ivy">
- <ivy:retrieve
- conf="*"
+ <ivy:retrieve
+ conf="*"
pattern="${basedir}/lib/[conf]/[artifact]-[revision].[ext]"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/build.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/build.xml b/asciidoc/samples/build.xml
index a7dbbcd..eeb823c 100644
--- a/asciidoc/samples/build.xml
+++ b/asciidoc/samples/build.xml
@@ -14,38 +14,38 @@
"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 License.
+ under the License.
-->
<project name="go-ivy" default="go" xmlns:ivy="antlib:org.apache.ivy.ant">
- <!--
- this build file is a self contained project: it doesn't require anything else
+ <!--
+ this build file is a self contained project: it doesn't require anything else
that ant 1.6.2 or greater and java 1.4 or greater properly installed.
-
+
It is used to showcase how easy and straightforward it can be to use Ivy.
-
- This is not an example of the best pratice to use in a project, especially
+
+ This is not an example of the best practice to use in a project, especially
for the java source code "generation" :-) (see generate-src target)
-
+
To run copy this file in an empty directory, open a shell or a command window
- in this directory and run "ant". It will download ivy and then use it to resolve
+ in this directory and run "ant". It will download ivy and then use it to resolve
the dependency of the class which is itself "contained" in this build script.
-
+
After a successful build run "ant" again and you will see the build will be
much faster.
-
+
More information can be found at http://ant.apache.org/ivy/
-->
-
- <!-- here is the version of ivy we will use. change this property to try a newer
+
+ <!-- here is the version of ivy we will use. change this property to try a newer
version if you want -->
- <property name="ivy.install.version" value="2.0.0-beta1" />
- <property name="ivy.jar.dir" value="${basedir}/ivy" />
- <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-
- <property name="build.dir" value="build" />
- <property name="src.dir" value="src" />
-
-
+ <property name="ivy.install.version" value="2.0.0-beta1"/>
+ <property name="ivy.jar.dir" value="${basedir}/ivy"/>
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
+
+ <property name="build.dir" value="build"/>
+ <property name="src.dir" value="src"/>
+
+
<target name="download-ivy" unless="skip.download">
<mkdir dir="${ivy.jar.dir}"/>
<!-- download Ivy from web site so that it can be used even without any special installation -->
@@ -53,9 +53,9 @@
<get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
dest="${ivy.jar.file}" usetimestamp="true"/>
</target>
-
- <!-- =================================
- target: install-ivy
+
+ <!-- =================================
+ target: install-ivy
this target is not necessary if you put ivy.jar in your ant lib directory
if you already have ivy in your ant lib, you can simply remove this
target and the dependency the 'go' target has on it
@@ -70,44 +70,44 @@
</path>
<taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
- </target>
-
- <!-- =================================
+ </target>
+
+ <!-- =================================
target: go
Go ivy, go!
================================= -->
- <target name="go" depends="install-ivy, generate-src"
+ <target name="go" depends="install-ivy, generate-src"
description="--> resolve dependencies, compile and run the project">
<echo message="using ivy to resolve commons-lang 2.1..."/>
- <!-- here comes the magic line: asks ivy to resolve a dependency on
+ <!-- here comes the magic line: asks ivy to resolve a dependency on
commons-lang 2.1 and to build an ant path with it from its cache -->
- <ivy:cachepath organisation="commons-lang" module="commons-lang" revision="2.1"
+ <ivy:cachepath organisation="commons-lang" module="commons-lang" revision="2.1"
pathid="lib.path.id" inline="true"/>
-
+
<echo message="compiling..."/>
- <mkdir dir="${build.dir}" />
- <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" />
-
+ <mkdir dir="${build.dir}"/>
+ <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id"/>
+
<echo>
We are now ready to execute our simple program with its dependency on commons-lang.
Let's go!
</echo>
<java classname="example.Hello">
<classpath>
- <path refid="lib.path.id" />
- <path location="${build.dir}" />
+ <path refid="lib.path.id"/>
+ <path location="${build.dir}"/>
</classpath>
</java>
</target>
- <!-- =================================
+ <!-- =================================
target: generate-src
- 'Generates' the class source. It actually just echo a simple java
+ 'Generates' the class source. It actually just echo a simple java
source code to a file. In real life this file would already be
present on your file system, and this target wouldn't be necessary.
================================= -->
<target name="generate-src">
- <mkdir dir="${src.dir}/example" />
+ <mkdir dir="${src.dir}/example"/>
<echo file="${src.dir}/example/Hello.java">
package example;
@@ -117,35 +117,35 @@ public class Hello {
public static void main(String[] args) {
String message = "hello ivy !";
System.out.println("standard message : " + message);
- System.out.println("capitalized by " + WordUtils.class.getName()
+ System.out.println("capitalized by " + WordUtils.class.getName()
+ " : " + WordUtils.capitalizeFully(message));
}
}
</echo>
</target>
-
- <!-- =================================
- target: clean
+
+ <!-- =================================
+ target: clean
================================= -->
<target name="clean" description="--> clean the project">
<delete includeemptydirs="true" quiet="true">
- <fileset dir="${src.dir}" />
- <fileset dir="${build.dir}" />
+ <fileset dir="${src.dir}"/>
+ <fileset dir="${build.dir}"/>
</delete>
</target>
-
- <!-- =================================
- target: clean-ivy
+
+ <!-- =================================
+ target: clean-ivy
================================= -->
<target name="clean-ivy" description="--> clean the ivy installation">
<delete dir="${ivy.jar.dir}"/>
</target>
-
- <!-- =================================
- target: clean-cache
+
+ <!-- =================================
+ target: clean-cache
================================= -->
- <target name="clean-cache" depends="install-ivy"
+ <target name="clean-cache" depends="install-ivy"
description="--> clean the ivy cache">
- <ivy:cleancache />
+ <ivy:cleancache/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/eclipse-plugin/build.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/eclipse-plugin/build.xml b/asciidoc/samples/eclipse-plugin/build.xml
index 93581b8..8b182c8 100644
--- a/asciidoc/samples/eclipse-plugin/build.xml
+++ b/asciidoc/samples/eclipse-plugin/build.xml
@@ -14,64 +14,64 @@
"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 License.
+ under the License.
-->
<project name="eclipse-plugin-build" xmlns:ivy="ivy">
<!-- Load Ivy ant tasks -->
- <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" />
- <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the folowing -->
+ <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml"/>
+ <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the following -->
<!-- taskdef rather than the above one -->
- <!--path id="ivy.classpath">
+ <!--path id="ivy.classpath">
<fileset dir="${basedir}">
- <include name="ivy.jar" />
+ <include name="ivy.jar"/>
</fileset>
</path>
<taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" classpathref="ivy.classpath" /-->
<!-- Load the properties where is defined the eclipse home -->
- <property file="${basedir}/ivysettings.properties" />
+ <property file="${basedir}/ivysettings.properties"/>
<target name="clean" description="Clean the build directory">
- <delete dir="${basedir}/target" />
+ <delete dir="${basedir}/target"/>
</target>
<target name="buildobr" description="Build the obr index">
<!-- build the repo.xml which aggregate every metadata of the Eclipse plugins -->
- <mkdir dir="${basedir}/target" />
- <ivy:buildobr baseDir="${eclipse.home}" basePath="${eclipse.home}" out="${basedir}/target/repo-eclipse.xml" indent="true" />
+ <mkdir dir="${basedir}/target"/>
+ <ivy:buildobr baseDir="${eclipse.home}" basePath="${eclipse.home}" out="${basedir}/target/repo-eclipse.xml" indent="true"/>
</target>
<target name="ivy:configure">
<!-- classical ivy configuration -->
- <ivy:configure file="ivysettings.xml" />
+ <ivy:configure file="ivysettings.xml"/>
</target>
<target name="ivy:resolve" depends="ivy:configure">
<!-- classical resolve and cache-path -->
- <ivy:resolve file="ivy.xml" conf="*" />
- <ivy:cachepath pathid="compile.classpath" conf="compile" useOrigin="true" />
+ <ivy:resolve file="ivy.xml" conf="*"/>
+ <ivy:cachepath pathid="compile.classpath" conf="compile" useOrigin="true"/>
</target>
<target name="compile" depends="ivy:resolve" description="Compile the Eclipse plugin">
- <mkdir dir="${basedir}/target/classes" />
+ <mkdir dir="${basedir}/target/classes"/>
<!-- simple javac (WARNING: contrary to the JDT, javac doesn't understand OSGi's accessibility (private packages)) -->
- <javac srcdir="${basedir}/src" classpathref="compile.classpath" destdir="${basedir}/target/classes" debug="true" includeAntRuntime="false" />
+ <javac srcdir="${basedir}/src" classpathref="compile.classpath" destdir="${basedir}/target/classes" debug="true" includeAntRuntime="false"/>
<copy todir="${basedir}/target/classes">
<fileset dir="${basedir}/src">
- <include name="**" />
- <exclude name="**/*.java" />
- <exclude name="**/package.html" />
+ <include name="**"/>
+ <exclude name="**/*.java"/>
+ <exclude name="**/package.html"/>
</fileset>
<fileset dir="${basedir}">
- <include name="plugin.xml" />
+ <include name="plugin.xml"/>
</fileset>
</copy>
</target>
<target name="build" depends="compile" description="Build the Eclipse plugin">
<!-- simple jaring -->
- <jar basedir="${basedir}/target/classes" destfile="${basedir}/target/${ant.project.name}.jar" manifest="META-INF/MANIFEST.MF" />
+ <jar basedir="${basedir}/target/classes" destfile="${basedir}/target/${ant.project.name}.jar" manifest="META-INF/MANIFEST.MF"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/eclipse-plugin/ivy.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/eclipse-plugin/ivy.xml b/asciidoc/samples/eclipse-plugin/ivy.xml
index cf23e6c..fd50060 100644
--- a/asciidoc/samples/eclipse-plugin/ivy.xml
+++ b/asciidoc/samples/eclipse-plugin/ivy.xml
@@ -15,25 +15,25 @@
"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 License.
+ under the License.
-->
<ivy-module version="2.2" xmlns:o="http://ant.apache.org/ivy/osgi">
<info organisation="bundle" module="myplugin">
- <extends organisation="bundle" module="com.acme.myplugin" revision="1.0.0.qualifier" location="META-INF/MANIFEST.MF" />
+ <extends organisation="bundle" module="com.acme.myplugin" revision="1.0.0.qualifier" location="META-INF/MANIFEST.MF"/>
</info>
<configurations>
- <conf name="compile" extends="default,embedded" description="Dependencies for the compilation" />
- <conf name="embedded" description="Dependencies embedded into the plugin's jar" />
- <conf name="win32" extends="compile" description="To run on Microsoft Windows" />
- <conf name="macos" extends="compile" description="To run on Mac OS X" />
- <conf name="linux" extends="compile" description="To run on Linux" />
+ <conf name="compile" extends="default,embedded" description="Dependencies for the compilation"/>
+ <conf name="embedded" description="Dependencies embedded into the plugin's jar"/>
+ <conf name="win32" extends="compile" description="To run on Microsoft Windows"/>
+ <conf name="macos" extends="compile" description="To run on Mac OS X"/>
+ <conf name="linux" extends="compile" description="To run on Linux"/>
</configurations>
<dependencies>
<!-- example of a dependency that we can't declare in the MANIFEST.MF because we want it to be embedded -->
<!--dependency osgi="bundle" org="" module="org.apache.commons.httpcore" rev="4.1.0" conf="embedded->default" /-->
<!-- Ivy-Osgi doesn't understand bundle fragment -->
- <dependency org="bundle" name="org.eclipse.swt.win32.win32.x86" rev="3.+" conf="win32->default" />
- <dependency org="bundle" name="org.eclipse.swt.cocoa.macosx.x86_64" rev="3.+" conf="macos->default" />
- <dependency org="bundle" name="org.eclipse.swt.gtk.linux.x86" rev="3.+" conf="linux->default" />
+ <dependency org="bundle" name="org.eclipse.swt.win32.win32.x86" rev="3.+" conf="win32->default"/>
+ <dependency org="bundle" name="org.eclipse.swt.cocoa.macosx.x86_64" rev="3.+" conf="macos->default"/>
+ <dependency org="bundle" name="org.eclipse.swt.gtk.linux.x86" rev="3.+" conf="linux->default"/>
</dependencies>
</ivy-module>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/eclipse-plugin/ivysettings.properties
----------------------------------------------------------------------
diff --git a/asciidoc/samples/eclipse-plugin/ivysettings.properties b/asciidoc/samples/eclipse-plugin/ivysettings.properties
index b41f191..ef63e41 100644
--- a/asciidoc/samples/eclipse-plugin/ivysettings.properties
+++ b/asciidoc/samples/eclipse-plugin/ivysettings.properties
@@ -6,9 +6,9 @@
# * 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
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/eclipse-plugin/ivysettings.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/eclipse-plugin/ivysettings.xml b/asciidoc/samples/eclipse-plugin/ivysettings.xml
index 0be2afc..463596a 100644
--- a/asciidoc/samples/eclipse-plugin/ivysettings.xml
+++ b/asciidoc/samples/eclipse-plugin/ivysettings.xml
@@ -14,23 +14,23 @@
"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 License.
+ under the License.
-->
<ivysettings>
<!-- Load the properties where is defined the eclipse location -->
- <properties file="ivysettings.properties" />
+ <properties file="ivysettings.properties"/>
<!-- We need to define the Ivy Osgi latest strategy as the default one -->
- <settings defaultResolver="eclipse" defaultLatestStrategy="latest-osgi" />
+ <settings defaultResolver="eclipse" defaultLatestStrategy="latest-osgi"/>
<!-- These are usual cache setup -->
<caches resolutionCacheDir="${ivy.settings.dir}/cache/resolution" useOrigin="true">
- <cache name="eclipse" basedir="${ivy.settings.dir}/cache/eclipse" />
+ <cache name="eclipse" basedir="${ivy.settings.dir}/cache/eclipse"/>
</caches>
<!-- We just need to define our Ivy OSGi resolver -->
<resolvers>
- <obr name="eclipse" repoXmlFile="${ivy.settings.dir}/target/repo-eclipse.xml" />
+ <obr name="eclipse" repoXmlFile="${ivy.settings.dir}/target/repo-eclipse.xml"/>
</resolvers>
</ivysettings>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivy-doc.xsl
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivy-doc.xsl b/asciidoc/samples/ivy-doc.xsl
index 1f401ad..2b4e71e 100644
--- a/asciidoc/samples/ivy-doc.xsl
+++ b/asciidoc/samples/ivy-doc.xsl
@@ -15,7 +15,7 @@
"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 License.
+ under the License.
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -35,10 +35,10 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<html>
<head>
<title><xsl:value-of select="info/@module"/> by <xsl:value-of select="info/@organisation"/> :: Ivy description</title>
- <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="content-language" content="en" />
- <meta name="robots" content="index,follow" />
- <link rel="stylesheet" type="text/css" href="ivy-style.css" />
+ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"/>
+ <meta http-equiv="content-language" content="en"/>
+ <meta name="robots" content="index,follow"/>
+ <link rel="stylesheet" type="text/css" href="ivy-style.css"/>
</head>
<body>
<div id="logo"><a href="http://ant.apache.org/ivy/"><img src="http://ant.apache.org/ivy/images/logo.png"/></a><br/><a id="rep" href="http://www.jayasoft.fr/org/ivyrep/">Ivy Repository</a></div>
@@ -48,13 +48,13 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:attribute name="href">http://www.jayasoft.fr/org/ivyrep/<xsl:value-of select="info/@organisation"/>/<xsl:value-of select="info/@module"/>/</xsl:attribute>
<xsl:value-of select="info/@module"/>
</xsl:element>
- </span>
- by
+ </span>
+ by
<span id="organisation">
<xsl:element name="a">
<xsl:attribute name="href">http://www.jayasoft.fr/org/ivyrep/<xsl:value-of select="info/@organisation"/>/</xsl:attribute>
<xsl:value-of select="info/@organisation"/>
- </xsl:element>
+ </xsl:element>
</span></h1>
<div id="revision"><span id="revision">Revision: </span><xsl:value-of select="info/@revision"/></div>
<table class="header">
@@ -95,7 +95,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
</td></tr>
<tr><td class="title">Description</td><td class="value"><xsl:copy-of select="info/description"/></td></tr>
</table>
-
+
<xsl:if test="count($repositories) > 0">
<div id="repositories">
<h2>Public Repositories</h2>
@@ -128,7 +128,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
</table>
</div>
</xsl:if>
-
+
<div id="public-confs" class="conf">
<h2>Public Configurations</h2>
<table>
@@ -157,7 +157,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
</tbody>
</table>
</div>
-
+
<xsl:if test="count($deprecated.conf) > 0">
<div id="deprecated-confs" class="conf">
<h2>Deprecated Configurations</h2>
@@ -181,7 +181,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
</table>
</div>
</xsl:if>
-
+
<xsl:if test="count($private.conf) > 0">
<div id="deprecated-confs" class="conf">
<h2>Private Configurations</h2>
@@ -205,7 +205,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
</table>
</div>
</xsl:if>
-
+
<div id="artifacts">
<h2>Published Artifacts</h2>
<table>
@@ -224,13 +224,13 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<td>
<xsl:value-of select="@conf"/>
<xsl:for-each select="conf">
- <xsl:if test="position() > 1">,
+ <xsl:if test="position() > 1">,
</xsl:if>
<xsl:value-of select="@name"/>
</xsl:for-each>
<xsl:if test="not(@conf) and count(conf) = 0">
<i>all</i>
- </xsl:if>
+ </xsl:if>
</td>
</tr>
</xsl:for-each>
@@ -242,7 +242,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
</tbody>
</table>
</div>
-
+
<xsl:if test="count($dependencies) > 0">
<div id="dependencies">
<h2>Dependencies</h2>
@@ -273,8 +273,8 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
</table>
</div>
</xsl:if>
-
-
+
+
</body>
</html>
</xsl:template>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivy-report.css
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivy-report.css b/asciidoc/samples/ivy-report.css
index c89bd54..a5b58a2 100644
--- a/asciidoc/samples/ivy-report.css
+++ b/asciidoc/samples/ivy-report.css
@@ -18,13 +18,13 @@
body {
font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
- font-size:small;
+ font-size:small;
}
div#logo {
- float: right;
- padding-left: 10px;
- padding-bottom: 10px;
+ float: right;
+ padding-left: 10px;
+ padding-bottom: 10px;
background: white;
text-align: center;
}
@@ -36,13 +36,13 @@ div#logo {
div#date {
font-style: italic;
padding-left: 60px;
- padding-bottom: 40px;
+ padding-bottom: 40px;
}
h1 {
margin-bottom:2px;
-
+
border-color:#7A9437;
border-style:solid;
border-width:0 0 3px 0;
@@ -64,13 +64,13 @@ span#organisation {
margin: 12px 0px 0px 0px;
padding: 0px;
z-index: 1;
- padding-left: 10px
+ padding-left: 10px
}
#confmenu li {
display: inline;
overflow: hidden;
- list-style-type: none;
+ list-style-type: none;
}
#confmenu a, a.active {
@@ -79,7 +79,7 @@ span#organisation {
font: bold 1em "Trebuchet MS", Arial, sans-serif;
border: 2px solid black;
padding: 2px 5px 0px 5px;
- text-decoration: none;
+ text-decoration: none;
}
/*
@@ -95,20 +95,20 @@ background: #DEE4CD
#confmenu a:hover {
color: #fff;
- background: #ADC09F;
+ background: #ADC09F;
}
#confmenu a:visited {
- color: #DEDECF;
+ color: #DEDECF;
}
#confmenu a.active:visited {
- color: #7A9437;
+ color: #7A9437;
}
#confmenu a.active:hover {
background: #DEE4CD;
- color: #DEDECF;
+ color: #DEDECF;
}
#content {
@@ -116,23 +116,23 @@ background: #DEE4CD
padding: 20px;
border: 2px solid black;
border-top: none;
- z-index: 2;
+ z-index: 2;
}
#content a {
text-decoration: none;
- color: #E8E9BE;
+ color: #E8E9BE;
}
-#content a:hover {
- background: #898B5E;
+#content a:hover {
+ background: #898B5E;
}
h2 {
margin-bottom:2px;
font-size:medium;
-
+
border-color:#7A9437;
border-style:solid;
border-width:0 0 2px 0;
@@ -151,7 +151,7 @@ h4 {
margin-bottom:2px;
margin-top:2px;
font-size:medium;
-
+
border-color:#7A9437;
border-style:dashed;
border-width:0 0 1px 0;
@@ -276,4 +276,3 @@ td.title:first-letter {
color:#7A9437;
background-color:transparent;
}
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivy-sample-xslt.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivy-sample-xslt.xml b/asciidoc/samples/ivy-sample-xslt.xml
index 28f32dd..7c5bb94 100644
--- a/asciidoc/samples/ivy-sample-xslt.xml
+++ b/asciidoc/samples/ivy-sample-xslt.xml
@@ -16,7 +16,7 @@
"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 License.
+ under the License.
-->
<ivy-module version="2.0">
<info organisation="myorg"
@@ -24,15 +24,15 @@
revision="myrev"
status="integration"
publication="20041101110000">
-
+
<license name="MyLicense" url="http://www.my.org/mymodule/mylicense.html"/>
-
+
<ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
<ivyauthor name="myorg" url="http://www.myorg.org/"/>
<repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/" pattern="[organisation]/[module]/ivy-[revision].xml" ivys="true" artifacts="false"/>
- <description homepage="http://www.my.org/mymodule/">
+ <description homepage="http://www.my.org/mymodule/">
This module is <b>great</b> !<br/>
You can use it especially with myconf1 and myconf2, and myconf4 is not too bad too.
</description>
@@ -41,7 +41,7 @@
<conf name="myconf1" description="desc 1"/>
<conf name="myconf2" description="desc 2" visibility="public"/>
<conf name="myconf3" description="desc 3" visibility="private"/>
- <conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/>
+ <conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/>
<conf name="myoldconf" description="my old desc" deprecated="20050115"/>
</configurations>
<publications>
@@ -79,7 +79,7 @@
<dependency org="yourorg" name="yourmodule8" rev="8.1">
<artifact name="yourartifact8-1" type="jar"/>
<artifact name="yourartifact8-2" type="jar"/>
- </dependency>
+ </dependency>
<dependency org="yourorg" name="yourmodule9" rev="9.1" conf="myconf1,myconf2,myconf3->default">
<artifact name="yourartifact9-1" type="jar" conf="myconf1,myconf2"/>
@@ -87,14 +87,14 @@
<conf name="myconf2"/>
<conf name="myconf3"/>
</artifact>
- </dependency>
+ </dependency>
<dependency org="yourorg" name="yourmodule10" rev="10.1">
<include name="your.*" type="jar"/>
<include ext="xml"/>
<exclude name="toexclude"/>
</dependency>
-
+
<conflict org="yourorg" module=".*" manager="all"/>
<conflict org="theirorg" module="theirmodule1" rev="1.0, 1.1"/>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivy-sample.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivy-sample.xml b/asciidoc/samples/ivy-sample.xml
index 62ef74c..5c682e0 100644
--- a/asciidoc/samples/ivy-sample.xml
+++ b/asciidoc/samples/ivy-sample.xml
@@ -15,7 +15,7 @@
"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 License.
+ under the License.
-->
<ivy-module version="2.0">
<info organisation="myorg"
@@ -23,15 +23,15 @@
revision="myrev"
status="integration"
publication="20041101110000">
-
+
<license name="MyLicense" url="http://www.my.org/mymodule/mylicense.html"/>
-
+
<ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
<ivyauthor name="myorg" url="http://www.myorg.org/"/>
<repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/" pattern="[organisation]/[module]/ivy-[revision].xml" ivys="true" artifacts="false"/>
- <description homepage="http://www.my.org/mymodule/">
+ <description homepage="http://www.my.org/mymodule/">
This module is <b>great</b> !<br/>
You can use it especially with myconf1 and myconf2, and myconf4 is not too bad too.
</description>
@@ -40,7 +40,7 @@
<conf name="myconf1" description="desc 1"/>
<conf name="myconf2" description="desc 2" visibility="public"/>
<conf name="myconf3" description="desc 3" visibility="private"/>
- <conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/>
+ <conf name="myconf4" description="desc 4" extends="myconf1, myconf2"/>
<conf name="myoldconf" description="my old desc" deprecated="20050115"/>
</configurations>
<publications>
@@ -78,7 +78,7 @@
<dependency org="yourorg" name="yourmodule8" rev="8.1">
<artifact name="yourartifact8-1" type="jar"/>
<artifact name="yourartifact8-2" type="jar"/>
- </dependency>
+ </dependency>
<dependency org="yourorg" name="yourmodule9" rev="9.1" conf="myconf1,myconf2,myconf3->default">
<artifact name="yourartifact9-1" type="jar" conf="myconf1,myconf2"/>
@@ -86,14 +86,14 @@
<conf name="myconf2"/>
<conf name="myconf3"/>
</artifact>
- </dependency>
+ </dependency>
<dependency org="yourorg" name="yourmodule10" rev="10.1">
<include name="your.*" type="jar"/>
<include ext="xml"/>
<exclude name="toexclude"/>
- </dependency>
-
+ </dependency>
+
<conflict org="yourorg" module=".*" manager="all"/>
<conflict org="theirorg" module="theirmodule1" rev="1.0, 1.1"/>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivy-style.css
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivy-style.css b/asciidoc/samples/ivy-style.css
index 9518ef9..dd48d68 100644
--- a/asciidoc/samples/ivy-style.css
+++ b/asciidoc/samples/ivy-style.css
@@ -18,13 +18,13 @@
body {
font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
- font-size:small;
+ font-size:small;
}
div#logo {
- float: right;
- padding-left: 10px;
- padding-bottom: 10px;
+ float: right;
+ padding-left: 10px;
+ padding-bottom: 10px;
background: white;
text-align: center;
}
@@ -46,7 +46,7 @@ a#rep:hover {
h1 {
margin-bottom:2px;
-
+
border-color:#7A9437;
border-style:solid;
border-width:0 0 3px 0;
@@ -76,7 +76,7 @@ span#organisation a:hover {
h2 {
margin-bottom:2px;
font-size:medium;
-
+
border-color:#7A9437;
border-style:solid;
border-width:0 0 2px 0;
[6/6] ant-ivy git commit: This closes #50
Posted by hi...@apache.org.
This closes #50
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/ff49f0dd
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/ff49f0dd
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/ff49f0dd
Branch: refs/heads/master
Commit: ff49f0dd3b4b092d2f17219b5f4f5255b92c9624
Parents: 87cd5df b02336b
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Jul 2 16:56:04 2017 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Jul 2 16:56:04 2017 +0200
----------------------------------------------------------------------
asciidoc/ant.adoc | 40 +--
asciidoc/bestpractices.adoc | 18 +-
asciidoc/compatibility.adoc | 3 +-
asciidoc/concept.adoc | 54 ++--
asciidoc/configuration/caches/cache.adoc | 2 +-
asciidoc/configuration/caches/ttl.adoc | 2 +-
asciidoc/configuration/macrodef/attribute.adoc | 2 +-
asciidoc/configuration/namespace/dest.adoc | 2 +-
asciidoc/dev.adoc | 6 +-
asciidoc/dev/makerelease.adoc | 16 +-
asciidoc/index.adoc | 21 +-
asciidoc/install.adoc | 18 +-
asciidoc/ivyfile.adoc | 8 +-
asciidoc/ivyfile/artifact-conf.adoc | 2 +-
asciidoc/ivyfile/artifact-exclude.adoc | 4 +-
asciidoc/ivyfile/artifact.adoc | 10 +-
asciidoc/ivyfile/conf.adoc | 15 +-
asciidoc/ivyfile/configurations.adoc | 10 +-
asciidoc/ivyfile/conflict.adoc | 2 +-
asciidoc/ivyfile/conflicts.adoc | 8 +-
asciidoc/ivyfile/dependencies.adoc | 2 +-
asciidoc/ivyfile/dependency-artifact.adoc | 4 +-
asciidoc/ivyfile/dependency-conf.adoc | 2 +-
asciidoc/ivyfile/dependency-include.adoc | 2 +-
asciidoc/ivyfile/dependency.adoc | 16 +-
asciidoc/ivyfile/exclude.adoc | 3 +-
asciidoc/ivyfile/include.adoc | 3 +-
asciidoc/ivyfile/info.adoc | 1 -
asciidoc/ivyfile/ivyauthor.adoc | 2 +-
asciidoc/ivyfile/manager.adoc | 6 +-
asciidoc/ivyfile/mapped.adoc | 2 +-
asciidoc/ivyfile/override.adoc | 4 +-
asciidoc/moreexamples.adoc | 2 -
asciidoc/osgi.adoc | 13 +-
asciidoc/osgi/eclipse-plugin.adoc | 10 +-
asciidoc/osgi/osgi-mapping.adoc | 72 ++---
asciidoc/osgi/sigil.adoc | 1 -
asciidoc/osgi/standard-osgi.adoc | 6 +-
asciidoc/osgi/target-platform.adoc | 12 +-
asciidoc/principle.adoc | 9 +-
asciidoc/release-notes.adoc | 18 +-
asciidoc/resolver/bintray.adoc | 6 +-
asciidoc/resolver/chain.adoc | 1 -
asciidoc/resolver/dual.adoc | 2 -
asciidoc/resolver/filesystem.adoc | 4 +-
asciidoc/resolver/ibiblio.adoc | 3 +-
asciidoc/resolver/jar.adoc | 15 +-
asciidoc/resolver/mirrored.adoc | 9 +-
asciidoc/resolver/obr.adoc | 7 +-
asciidoc/resolver/osgiagg.adoc | 11 +-
asciidoc/resolver/packager.adoc | 17 +-
asciidoc/resolver/sftp.adoc | 7 +-
asciidoc/resolver/ssh.adoc | 4 +-
asciidoc/resolver/updatesite.adoc | 4 +-
asciidoc/resolver/url.adoc | 6 +-
asciidoc/resolver/vfs.adoc | 7 +-
asciidoc/running.adoc | 2 +-
asciidoc/samples/apache-hello-ivy-default.html | 14 +-
asciidoc/samples/build-install.xml | 22 +-
asciidoc/samples/build.xml | 104 +++---
asciidoc/samples/eclipse-plugin/build.xml | 38 +--
asciidoc/samples/eclipse-plugin/ivy.xml | 20 +-
.../eclipse-plugin/ivysettings.properties | 4 +-
asciidoc/samples/eclipse-plugin/ivysettings.xml | 10 +-
asciidoc/samples/ivy-doc.xsl | 36 +--
asciidoc/samples/ivy-report.css | 39 ++-
asciidoc/samples/ivy-sample-xslt.xml | 16 +-
asciidoc/samples/ivy-sample.xml | 18 +-
asciidoc/samples/ivy-style.css | 12 +-
asciidoc/samples/ivysettings-default.xml | 2 +-
.../jayasoft-ivyrep-example-default.html | 14 +-
asciidoc/samples/standard-osgi/build.xml | 44 +--
asciidoc/samples/standard-osgi/ivy.xml | 8 +-
asciidoc/samples/standard-osgi/ivysettings.xml | 8 +-
.../org.apache.ivy.sample.standard-osgi.bnd | 36 +--
asciidoc/samples/target-platform/build.xml | 34 +-
asciidoc/samples/target-platform/ivy.xml | 8 +-
.../samples/target-platform/ivysettings.xml | 8 +-
asciidoc/settings.adoc | 14 +-
asciidoc/settings/caches.adoc | 6 +-
asciidoc/settings/caches/cache.adoc | 15 +-
asciidoc/settings/caches/ttl.adoc | 6 +-
asciidoc/settings/conflict-managers.adoc | 1 -
asciidoc/settings/credentials.adoc | 1 -
asciidoc/settings/include.adoc | 2 +-
asciidoc/settings/latest-strategies.adoc | 5 +-
asciidoc/settings/lock-strategies.adoc | 2 +-
asciidoc/settings/macrodef.adoc | 31 +-
asciidoc/settings/macrodef/attribute.adoc | 3 -
asciidoc/settings/module.adoc | 7 +-
asciidoc/settings/modules.adoc | 2 -
asciidoc/settings/namespace.adoc | 3 -
asciidoc/settings/namespace/dest.adoc | 1 -
asciidoc/settings/namespace/fromtosystem.adoc | 2 -
asciidoc/settings/namespace/rule.adoc | 1 -
asciidoc/settings/namespace/src.adoc | 2 -
asciidoc/settings/namespaces.adoc | 2 -
asciidoc/settings/outputters.adoc | 3 +-
asciidoc/settings/parsers.adoc | 2 -
asciidoc/settings/properties.adoc | 5 +-
asciidoc/settings/property.adoc | 6 +-
asciidoc/settings/resolvers.adoc | 9 +-
asciidoc/settings/settings.adoc | 3 +-
asciidoc/settings/signers.adoc | 4 +-
asciidoc/settings/status.adoc | 1 -
asciidoc/settings/statuses.adoc | 6 +-
asciidoc/settings/triggers.adoc | 306 +++++++++---------
asciidoc/settings/typedef.adoc | 2 -
asciidoc/settings/version-matchers.adoc | 14 +-
asciidoc/standalone.adoc | 11 +-
asciidoc/style/style.css | 320 ++++++++-----------
asciidoc/terminology.adoc | 8 +-
asciidoc/textual.adoc | 3 +-
asciidoc/tutorial.adoc | 15 +-
asciidoc/tutorial/build-repository.adoc | 4 +-
.../tutorial/build-repository/advanced.adoc | 20 +-
asciidoc/tutorial/build-repository/basic.adoc | 20 +-
asciidoc/tutorial/conf.adoc | 24 +-
asciidoc/tutorial/defaultconf.adoc | 30 +-
asciidoc/tutorial/dependence.adoc | 62 ++--
asciidoc/tutorial/dual.adoc | 14 +-
asciidoc/tutorial/multiple.adoc | 18 +-
asciidoc/tutorial/multiproject.adoc | 48 ++-
asciidoc/tutorial/start.adoc | 20 +-
asciidoc/use/artifactproperty.adoc | 2 +-
asciidoc/use/artifactreport.adoc | 4 +-
asciidoc/use/buildlist.adoc | 10 +-
asciidoc/use/buildnumber.adoc | 10 +-
asciidoc/use/buildobr.adoc | 20 +-
asciidoc/use/cachefileset.adoc | 2 +-
asciidoc/use/cachepath.adoc | 6 +-
asciidoc/use/checkdepsupdate.adoc | 4 +-
asciidoc/use/cleancache.adoc | 6 +-
asciidoc/use/configure.adoc | 16 +-
asciidoc/use/convertmanifest.adoc | 2 +-
asciidoc/use/convertpom.adoc | 2 +-
asciidoc/use/deliver.adoc | 12 +-
asciidoc/use/dependencytree.adoc | 2 +-
asciidoc/use/fixdeps.adoc | 8 +-
asciidoc/use/info.adoc | 8 +-
asciidoc/use/makepom.adoc | 6 +-
asciidoc/use/postresolvetask.adoc | 4 +-
asciidoc/use/publish.adoc | 4 +-
asciidoc/use/report.adoc | 10 +-
asciidoc/use/repreport.adoc | 14 +-
asciidoc/use/resolve.adoc | 14 +-
asciidoc/use/resources.adoc | 12 +-
asciidoc/use/retrieve.adoc | 10 +-
asciidoc/use/settings.adoc | 24 +-
asciidoc/use/var.adoc | 2 +-
asciidoc/yed.adoc | 4 +-
151 files changed, 1116 insertions(+), 1219 deletions(-)
----------------------------------------------------------------------
[2/6] ant-ivy git commit: Check spelling; fix whitespace and links;
sort entries in .gitignore
Posted by hi...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/tutorial.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial.adoc b/asciidoc/tutorial.adoc
index 5a46f96..208e829 100644
--- a/asciidoc/tutorial.adoc
+++ b/asciidoc/tutorial.adoc
@@ -37,27 +37,26 @@ OK, you've just seen how easy it is to take your first step with Ivy. Go ahead w
The following tutorials are available:
-* link:tutorial/start.html[Quick Start] +
+* link:tutorial/start.html[Quick Start] +
Guides you through your very first steps with ivy.
-* link:tutorial/defaultconf.html[Adjusting default settings] +
+* link:tutorial/defaultconf.html[Adjusting default settings] +
Gives you a better understanding of the default settings and shows you how to customize them to your needs.
-* link:tutorial/multiple.html[Multiple Resolvers] +
+* link:tutorial/multiple.html[Multiple Resolvers] +
Teaches you how to configure Ivy to find its dependencies in multiple places.
-* link:tutorial/dual.html[Dual Resolver] +
+* link:tutorial/dual.html[Dual Resolver] +
Helps you configure Ivy to find ivy files in one place and artifacts in another.
-* link:tutorial/dependence.html[Project dependencies] +
+* link:tutorial/dependence.html[Project dependencies] +
A starting point for using Ivy in a multi-project environment.
-* link:tutorial/multiproject.html[Using Ivy in multiple projects environment] +
+* link:tutorial/multiproject.html[Using Ivy in multiple projects environment] +
A more complex example demonstrating the use of Ant+Ivy in a multi-project environment.
* link:tutorial/conf.html[Using Ivy Module Configurations] +
Shows you how to use configurations in an ivy file to define sets of artifacts.
-* link:tutorial/build-repository.html[Building a repository] +
+* link:tutorial/build-repository.html[Building a repository] +
Shows you how to build your own enterprise repository.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/tutorial/build-repository.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/build-repository.adoc b/asciidoc/tutorial/build-repository.adoc
index 95f73bd..4f29860 100644
--- a/asciidoc/tutorial/build-repository.adoc
+++ b/asciidoc/tutorial/build-repository.adoc
@@ -28,7 +28,7 @@ To demonstrate this, we will first use a basic ivy settings file to show how it
The project that we will use is pretty simple. It is composed of an Ant build file, and two ivy settings files.
-Here are the public targets that we will use:
+Here are the public targets that we will use:
[source,shell]
----
@@ -57,5 +57,3 @@ This project is accessible in the link:https://git-wip-us.apache.org/repos/asf?p
Next steps:
link:../tutorial/build-repository/basic.html[Basic repository copy]
link:../tutorial/build-repository/advanced.html[Using namespaces]
-
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/tutorial/build-repository/advanced.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/build-repository/advanced.adoc b/asciidoc/tutorial/build-repository/advanced.adoc
index 61b82f2..0558797 100644
--- a/asciidoc/tutorial/build-repository/advanced.adoc
+++ b/asciidoc/tutorial/build-repository/advanced.adoc
@@ -17,13 +17,13 @@
under the License.
////
-Now that you have seen how simple it is to create your own repository from an existing one, you may wonder how you can handle more complex cases, like when the source and destination repositories don't follow the same naming conventions.
+Now that you have seen how simple it is to create your own repository from an existing one, you may wonder how you can handle more complex cases, like when the source and destination repositories don't follow the same naming conventions.
== On the road to a professional repository
-In this section, you will learn how to build a *professional* repository. What is a *professional* repository? Our vision is to say that a good quality repository must follow clear rules about projects naming and must offer correct, useable, configurations and verified project descriptors. In order to achieve those goals, we think that you have to build your own repository.
+In this section, you will learn how to build a *professional* repository. What is a *professional* repository? Our vision is to say that a good quality repository must follow clear rules about projects naming and must offer correct, usable, configurations and verified project descriptors. In order to achieve those goals, we think that you have to build your own repository.
We have seen in the previous example, that we could use some public repositories to begin to build our own repository. Nevertheless, the result is not always the expected one, especially concerning the naming rules used.
This problem is pretty normal when you have an existing repository, and want to benefit from large public repositories which do not follow the same naming conventions. It also shows up because many public repositories do not use a consistent naming scheme. For example, why don't all the apache commons modules use the org.apache.commons organization? Well.. for historical reasons. But if you setup your own repository, you may not want to suffer from the mistakes of history.
@@ -85,8 +85,8 @@ Actually, Ivy uses the same repository as before for the source repository, with
[source]
----
-<ibiblio name="libraries"
- root="${ibiblio-maven2-root}"
+<ibiblio name="libraries"
+ root="${ibiblio-maven2-root}"
m2compatible="true"
namespace="maven2"
/>
@@ -105,14 +105,14 @@ For the namespace we call __maven2__, we have declared several rules. Below is o
<rule> <!-- imported apache maven1 projects -->
<fromsystem>
<src org="apache" module=".+"/>
-
+
<dest org="$m0" module="$m0"/>
</fromsystem>
<tosystem>
- <src org="commons-.+" module="commons-.+" />
- <src org="ant.*" module="ant.*" />
+ <src org="commons-.+" module="commons-.+"/>
+ <src org="ant.*" module="ant.*"/>
...
- <src org="xmlrpc" module="xmlrpc" />
+ <src org="xmlrpc" module="xmlrpc"/>
<dest org="apache" module="$m0"/>
</tosystem>
@@ -132,7 +132,7 @@ and for revisions : $r0, $r1, ...
====
-To understand namespaces,
+To understand namespaces,
* *fromsystem :* we define here that the projects defined in the system namespace under the organization called "apache" are transformed into the destination namespace into projects whose organization is named with the module name, whatever the revision is. For example, the project apache#commons-lang;1.0 in the system namespace will be translated into commons-lang#commons-lang;1.0 in the maven2 resolver namespace. +
@@ -142,7 +142,7 @@ To understand namespaces,
OK, you should now get the idea behind namespaces, so go ahead and look at the `ivysettings-advanced.xml` file in this example. You can test the installation of a module and its dependencies using namespaces.
-Run
+Run
[source]
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/tutorial/build-repository/basic.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/build-repository/basic.adoc b/asciidoc/tutorial/build-repository/basic.adoc
index 26cd323..dfe6a16 100644
--- a/asciidoc/tutorial/build-repository/basic.adoc
+++ b/asciidoc/tutorial/build-repository/basic.adoc
@@ -30,10 +30,10 @@ The ivy settings file that we will use is very simple here. It defines two resol
<ivysettings>
<settings defaultResolver="libraries"
- defaultConflictManager="all" /> <!-- in order to get all revisions without any eviction -->
- <caches defaultCacheDir="${ivy.cache.dir}/no-namespace" />
+ defaultConflictManager="all"/> <!-- in order to get all revisions without any eviction -->
+ <caches defaultCacheDir="${ivy.cache.dir}/no-namespace"/>
<resolvers>
- <ibiblio name="libraries" m2compatible="true" />
+ <ibiblio name="libraries" m2compatible="true"/>
<filesystem name="my-repository">
<ivy pattern="${dest.repo.dir}/no-namespace/[organisation]/[module]/ivys/ivy-[revision].xml"/>
<artifact pattern="${dest.repo.dir}/no-namespace/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
@@ -53,9 +53,9 @@ Let's have a look at the _maven2_ target.
<target name="maven2" depends="init-ivy"
description="--> install module from maven 2 repository">
- <ivy:install settingsRef="basic.settings"
- organisation="commons-lang" module="commons-lang" revision="1.0"
- from="${from.resolver}" to="${to.resolver}" />
+ <ivy:install settingsRef="basic.settings"
+ organisation="commons-lang" module="commons-lang" revision="1.0"
+ from="${from.resolver}" to="${to.resolver}"/>
</target>
----
@@ -96,11 +96,11 @@ The `maven2-deps` target is very similar to the one described above, except that
[source]
----
- <target name="maven2-deps" depends="init-ivy"
+ <target name="maven2-deps" depends="init-ivy"
description="--> install module from maven 2 repository with dependencies">
- <ivy:install settingsRef="basic.settings"
- organisation="org.hibernate" module="hibernate" revision="3.2.5.ga"
- from="${from.resolver}" to="${to.resolver}" transitive="true" />
+ <ivy:install settingsRef="basic.settings"
+ organisation="org.hibernate" module="hibernate" revision="3.2.5.ga"
+ from="${from.resolver}" to="${to.resolver}" transitive="true"/>
</target>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/tutorial/conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/conf.adoc b/asciidoc/tutorial/conf.adoc
index 39aa94d..6ceee55 100644
--- a/asciidoc/tutorial/conf.adoc
+++ b/asciidoc/tutorial/conf.adoc
@@ -29,7 +29,7 @@ Source code is available in `src/example/configurations/multi-projects`.
We have two projects :
- filter-framework is a library that defines an api to filter String arrays and two implementations of this api.
- myapp is a very small app that uses filter-framework.
-
+
The filter-framework library project produces 3 artifacts:
- the api jar,
- an implementation jar with no external dependencies,
@@ -61,7 +61,7 @@ The first project we'll look at in this tutorial is filter-framework. In order t
<publications>
<artifact name="filter-api" type="jar" conf="api" ext="jar"/>
<artifact name="filter-hmimpl" type="jar" conf="homemade-impl" ext="jar"/>
- <artifact name="filter-ccimpl" type="jar" conf="cc-impl" ext="jar"/>
+ <artifact name="filter-ccimpl" type="jar" conf="cc-impl" ext="jar"/>
</publications>
<dependencies>
<dependency org="commons-collections" name="commons-collections" rev="3.1" conf="cc-impl->default"/>
@@ -111,13 +111,13 @@ Now that we have shipped (published) our fantastic filter library, we want to us
<ivy-module version="1.0">
<info organisation="org.apache" module="myapp"/>
-
+
<configurations>
- <conf name="build" visibility="private" description="compilation only need api jar" />
- <conf name="noexternaljar" description="use only company jar" />
- <conf name="withexternaljar" description="use company jar and third party jars" />
+ <conf name="build" visibility="private" description="compilation only need api jar"/>
+ <conf name="noexternaljar" description="use only company jar"/>
+ <conf name="withexternaljar" description="use company jar and third party jars"/>
</configurations>
-
+
<dependencies>
<dependency org="org.apache" name="filter-framework" rev="latest.integration" conf="build->api; noexternaljar->homemade-impl; withexternaljar->cc-impl"/>
</dependencies>
@@ -133,11 +133,11 @@ We create 3 configurations that define the different ways we want to use the app
We also defined a dependency on our previously built library. In this dependency, we use configuration mappings to match ours with the dependency's configurations. You can find more information about configuration mapping link:../ivyfile/configurations.html[here]
-
+
. *build->api* : here we tell Ivy that our *build* configuration depends on the *api* configuration of the dependency +
-
+
. *noexternaljar->homemade-impl* : here we tell Ivy that our *noexternaljar* configuration depends on the *homemade-impl* configuration of the dependency. +
-
+
. *withexternaljar->cc-impl* : here we tell Ivy that our *withexternaljar* configuration depends on the *cc-impl* configuration of the dependency +
Note that we never declare any of the dependency's artifacts we need in each configuration: it's the dependency module's ivy file which declares the published artifacts and which should be used in each configuration.
@@ -148,9 +148,9 @@ In the Ant `build.xml` file, we defined a 'resolve' target as follow:
[source]
----
-<target name="resolve" description="--> retreive dependencies with ivy">
+<target name="resolve" description="--> retrieve dependencies with ivy">
<ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact].[ext]"/>
-</target>
+</target>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/tutorial/defaultconf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/defaultconf.adoc b/asciidoc/tutorial/defaultconf.adoc
index 52b68f0..ac0841e 100644
--- a/asciidoc/tutorial/defaultconf.adoc
+++ b/asciidoc/tutorial/defaultconf.adoc
@@ -17,7 +17,7 @@
under the License.
////
-Ivy comes bundled with some default settings which makes it pretty simple to use in a typical environment. This tutorial, which is close to a reference document, explains what those default settings are and how they can be adjusted to your needs.
+Ivy comes bundled with some default settings which makes it pretty simple to use in a typical environment. This tutorial, which is close to a reference document, explains what those default settings are and how they can be adjusted to your needs.
To fully understand the concept of settings and what you can do with them, we suggest reading other tutorials related to settings (like link:../tutorial/multiple.html[Multiple Resolvers] and link:../tutorial/dual.html[Dual Resolver]) or the link:../settings.html[Settings Files] reference documentation.
@@ -28,7 +28,7 @@ The default settings include 3 types of repositories:
* local +
- a repository which is private to the user.
+ a repository which is private to the user.
* shared +
a repository which is shared between all the members of a team
@@ -45,13 +45,13 @@ Now let's describe each of these repository concepts in more detail. We will des
The local repository is particularly useful when you want to do something without being disturbed by anything else happening in the environment. This means that whenever Ivy is able to locate a module in this repository it will be used, no matter what is available in others.
-For instance, if you have a module declaring a dependency on the module __foo__ with a revision of __latest.integration__, then if a revision of __foo__ is found in the local repository, it will be used, _even if a more recent revision is available in other repositories_.
+For instance, if you have a module declaring a dependency on the module __foo__ with a revision of __latest.integration__, then if a revision of __foo__ is found in the local repository, it will be used, _even if a more recent revision is available in other repositories_.
This may be disturbing for some of you, but imagine you have to implement a new feature on a project, and in order to achieve that you need to modify two modules: you add a new method in module __foo__ and exploit this new method in module __bar__. Then if you publish the module __foo__ to your local repository, you will be sure to get it in your __bar__ module, even if someone else publishes a new revision of __foo__ in the shared repository (this revision not having the new method you are currently adding).
But be careful, when you have finished your development and publish it on the shared repository, you will have to clean your local repository to benefit from new versions published in the shared repository.
-Note also that modules found in the local repository must be complete, i.e. they must provide both a module descriptor and the published artifacts.
+Note also that modules found in the local repository must be complete, i.e. they must provide both a module descriptor and the published artifacts.
=== Shared
@@ -82,7 +82,7 @@ For example:
<target name="resolve">
<property name="ivy.default.ivy.user.dir" value="/path/to/ivy/user/dir"/>
- <ivy:resolve />
+ <ivy:resolve/>
</target>
----
@@ -91,7 +91,7 @@ Next we will show you how to override default values for the different kinds of
=== Local
-By default, the local repository lies in `${ivy.default.ivy.user.dir}/local`. This is usually a good place, but you may want to modify it. No problem, you just have to set the following Ivy variable to the directory you want to use:
+By default, the local repository lies in `${ivy.default.ivy.user.dir}/local`. This is usually a good place, but you may want to modify it. No problem, you just have to set the following Ivy variable to the directory you want to use:
[source]
----
ivy.local.default.root
@@ -135,7 +135,7 @@ ivy.local.default.artifact.pattern=[module]/[revision]/[artifact].[ext]
=== Shared
-By default, the shared repository lies in `${ivy.default.ivy.user.dir}/shared`. This is fine if you work alone, but the shared repository is supposed to be, mmm, shared! So changing this directory is often required, and it is usually modified to point to a network shared directory. You can use the
+By default, the shared repository lies in `${ivy.default.ivy.user.dir}/shared`. This is fine if you work alone, but the shared repository is supposed to be, mmm, shared! So changing this directory is often required, and it is usually modified to point to a network shared directory. You can use the
[source]
----
ivy.shared.default.root
@@ -172,7 +172,7 @@ ivy.shared.default.artifact.pattern=[organisation]/[module]/[revision]/[artifact
By default, the public repository is ibiblio in m2 compatible mode (in other words, the maven 2 public repository).
-This repository has the advantage of providing a lot of modules, with metadata for most of them. The quality of metadata is not always perfect, but it's a very good start to use a tool like Ivy and benefit from the power of transitive dependency management.
+This repository has the advantage of providing a lot of modules, with metadata for most of them. The quality of metadata is not always perfect, but it's a very good start to use a tool like Ivy and benefit from the power of transitive dependency management.
Despite its ease of use, we suggest reading the link:../bestpractices.html[Best practices] to have a good understanding of the pros and cons of using a public unmanaged repository before depending on such a repository for your enterprise build system.
@@ -182,7 +182,7 @@ ivy.14.compatible=true as an ant property_
== Going further
-OK, so we have seen how to easily change the settings of the three main repositories. But what if my shared repository is on a web server? What if you don't want to use maven 2 repository as the public repository? What if ...
+OK, so we have seen how to easily change the settings of the three main repositories. But what if my shared repository is on a web server? What if you don't want to use maven 2 repository as the public repository? What if ...
No problem, Ivy is very flexible and can be configured with specific settings to match your needs and environment. But before considering writing your own settings from scratch, we suggest reading the following where you will learn how to leverage a part of the default settings and adjust the rest.
@@ -229,8 +229,8 @@ To finish this example, you have to write your own ivysettings file (that you wi
<ivysettings>
<resolvers>
<filesystem name="public">
- <ivy pattern="/path/to/my/public/rep/[organisation]/[module]/ivy-[revision].xml" />
- <artifact pattern="/path/to/my/public/rep/[organisation]/[module]/[artifact]-[revision].[ext]" />
+ <ivy pattern="/path/to/my/public/rep/[organisation]/[module]/ivy-[revision].xml"/>
+ <artifact pattern="/path/to/my/public/rep/[organisation]/[module]/[artifact]-[revision].[ext]"/>
</filesystem>
</resolvers>
</ivysettings>
@@ -262,8 +262,8 @@ Now the last thing you will need in order to properly take advantage of the defa
<property name="ivy.shared.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
<resolvers>
<filesystem name="shared">
- <ivy pattern="${ivy.shared.default.root}/${ivy.shared.default.ivy.pattern}" />
- <artifact pattern="${ivy.shared.default.root}/${ivy.shared.default.artifact.pattern}" />
+ <ivy pattern="${ivy.shared.default.root}/${ivy.shared.default.ivy.pattern}"/>
+ <artifact pattern="${ivy.shared.default.root}/${ivy.shared.default.artifact.pattern}"/>
</filesystem>
</resolvers>
</ivysettings>
@@ -281,8 +281,8 @@ Now the last thing you will need in order to properly take advantage of the defa
<property name="ivy.local.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
<resolvers>
<filesystem name="local">
- <ivy pattern="${ivy.local.default.root}/${ivy.local.default.ivy.pattern}" />
- <artifact pattern="${ivy.local.default.root}/${ivy.local.default.artifact.pattern}" />
+ <ivy pattern="${ivy.local.default.root}/${ivy.local.default.ivy.pattern}"/>
+ <artifact pattern="${ivy.local.default.root}/${ivy.local.default.artifact.pattern}"/>
</filesystem>
</resolvers>
</ivysettings>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/tutorial/dependence.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/dependence.adoc b/asciidoc/tutorial/dependence.adoc
index 0fa3b8b..502cb3f 100644
--- a/asciidoc/tutorial/dependence.adoc
+++ b/asciidoc/tutorial/dependence.adoc
@@ -19,11 +19,11 @@
This tutorial will show you how to use Ivy when one of your projects depends on another.
-For our example, we will have two projects, depender and dependee, where the depender project uses/requires the dependee project. This example will help illustrate two things about Ivy:
+For our example, we will have two projects, depender and dependee, where the depender project uses/requires the dependee project. This example will help illustrate two things about Ivy:
+
-
* that dependencies defined by parent projects (dependee) will automatically be retrieved for use by child projects (depender) +
-
+
* that child projects can retrieve the "latest" version of the dependee project +
@@ -34,19 +34,19 @@ For our example, we will have two projects, depender and dependee, where the dep
The dependee project is very simple. It depends on the apache library commons-lang and contains only one class: `standalone.Main` which provides two services:
-
+
* return the version of the project +
-
+
* capitalize a string using `org.apache.commons.lang.WordUtils.capitalizeFully` +
Here is the content of the project:
-
+
* build.xml: the ant build file for the project +
-
+
* ivy.xml: the project ivy file +
-
-* src tandalone\Main.java: the only class of the project +
+
+* src standalone\Main.java: the only class of the project +
Take a look at the *ivy.xml* file:
@@ -68,9 +68,9 @@ The ivy file declares only one dependency, that being the apache commons-lang li
The depender project is very simple as well. It declares only one dependency on the latest version of the dependee project, and it contains only one class, `depending.Main`, which does 2 things:
-
+
* gets the version of the standalone project by calling `standalone.Main.getVersion()` +
-
+
* transforms a string by calling `standalone.Main.capitalizeWords(str)` +
Take a look at the `ivy.xml` file:
@@ -81,7 +81,7 @@ Take a look at the `ivy.xml` file:
<ivy-module version="1.0">
<info organisation="org.apache" module="depender"/>
<dependencies>
- <dependency name="dependee" rev="latest.integration" />
+ <dependency name="dependee" rev="latest.integration"/>
</dependencies>
</ivy-module>
@@ -92,9 +92,9 @@ Take a look at the `ivy.xml` file:
The Ivy settings are defined in two files located in the settings directory:
-
+
* `ivysettings.properties`: a property file +
-
+
* `ivysettings.xml`: the file containing the settings +
@@ -105,14 +105,14 @@ Let's have a look at the `ivysettings.xml` file:
<ivysettings>
<properties file="${ivy.settings.dir}/ivysettings.properties"/>
- <settings defaultResolver="libraries" />
- <caches defaultCacheDir="${ivy.settings.dir}/ivy-cache" />
+ <settings defaultResolver="libraries"/>
+ <caches defaultCacheDir="${ivy.settings.dir}/ivy-cache"/>
<resolvers>
<filesystem name="projects">
- <artifact pattern="${repository.dir}/[artifact]-[revision].[ext]" />
- <ivy pattern="${repository.dir}/[module]-[revision].xml" />
+ <artifact pattern="${repository.dir}/[artifact]-[revision].[ext]"/>
+ <ivy pattern="${repository.dir}/[module]-[revision].xml"/>
</filesystem>
- <ibiblio name="libraries" m2compatible="true" usepoms="false" />
+ <ibiblio name="libraries" m2compatible="true" usepoms="false"/>
</resolvers>
<modules>
<module organisation="org.apache" name="dependee" resolver="projects"/>
@@ -129,13 +129,13 @@ This tag loads some properties for the Ivy process, just like Ant does.
=== settings
-This tag initializes some parameters for the Ivy process. In this case, the directory that Ivy will use to cache artifacts will be in a sub directory called ivy-cache of the directory containing the `ivysettings.xml` file itself.
+This tag initializes some parameters for the Ivy process. In this case, the directory that Ivy will use to cache artifacts will be in a sub directory called ivy-cache of the directory containing the `ivysettings.xml` file itself.
The second parameter, tells Ivy to use a resolver named "libraries" as its default resolver. More information can be found in the link:../settings.html[settings reference documentation].
=== resolvers
This tag defines the resolvers to use. Here we have two resolvers defined: "projects" and "libraries".
-The filesystem resolver called "projects" is able to resolve the internal dependencies by locating them on the local filesystem.
+The filesystem resolver called "projects" is able to resolve the internal dependencies by locating them on the local filesystem.
The ibiblio resolver called "libraries" is able to find dependencies on the maven 2 repository, but doesn't use maven poms.
=== modules
@@ -175,11 +175,11 @@ include::asciidoc/tutorial/log/dependence-standalone.txt[]
What we see here:
-
+
* the project depends on 1 library (1 artifact) +
-
+
* the library was not in the Ivy cache and so was downloaded (1 downloaded) +
-
+
* the project has been released under version number 1 +
@@ -210,13 +210,13 @@ include::asciidoc/tutorial/log/dependence-depending.txt[]
What we see here:
-
+
* the project depends on 2 libraries (2 artifacts) +
-
+
* one of the libraries was in the cache because there was only 1 download (1 downloaded) +
-
+
* Ivy retrieved version 1 of the project "dependee". The call to `standalone.Main.getVersion()` has returned 1. If you look in the `depender/lib` directory, you should see `dependee-1.jar` which is the version 1 artifact of the project "dependee" +
-
+
* the call to `standalone.Main.capitalizeWords(str)` succeed, which means that the required library was in the classpath. If you look at the `lib` directory, you will see that the library `commons-lang-2.0.jar` was also retrieved. This library was declared as a dependency of the "dependee" project, so Ivy retrieves it (transitively) along with the dependee artifact. +
@@ -253,11 +253,11 @@ OK, now our repository contains two versions of the project *dependee*, so other
=== step 6: get the new version in _depender_ project
-What should we expect if we run the depender project again? It should:
+What should we expect if we run the depender project again? It should:
+
-
* retrieve version 2 as the latest.integration version of the dependee project +
-
+
* display version 2 of dependee project +
Let's try it!!
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/tutorial/dual.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/dual.adoc b/asciidoc/tutorial/dual.adoc
index 594676a..ba33d9c 100644
--- a/asciidoc/tutorial/dual.adoc
+++ b/asciidoc/tutorial/dual.adoc
@@ -43,11 +43,11 @@ It depends on two libraries: Apache commons-lang and Apache commons-httpclient.
Here is the content of the project:
-
+
* build.xml: the ant build file for the project +
-
+
* ivy.xml: the ivy project file +
-
+
* src\example\Hello.java: the only class of the project +
@@ -82,9 +82,9 @@ The ivy settings are defined in the `ivysettings.xml` file located in the `setti
<resolvers>
<dual name="dual-example">
<filesystem name="ivys">
- <ivy pattern="${ivy.settings.dir}/../repository/[module]-ivy-[revision].xml" />
+ <ivy pattern="${ivy.settings.dir}/../repository/[module]-ivy-[revision].xml"/>
</filesystem>
- <ibiblio name="ibiblio" m2compatible="true" usepoms="false" />
+ <ibiblio name="ibiblio" m2compatible="true" usepoms="false"/>
</dual>
</resolvers>
</ivysettings>
@@ -136,7 +136,7 @@ As you can see, Ivy not only downloaded commons-lang and commons-httpclient, but
----
<ivy-module version="1.0">
- <info
+ <info
organisation="commons-httpclient"
module="commons-httpclient"
revision="2.0.2"
@@ -151,7 +151,7 @@ As you can see, Ivy not only downloaded commons-lang and commons-httpclient, but
-So everything seemed to work. The ivy file was found in the `repository` directory and the artifacts have been downloaded from ibiblio.
+So everything seemed to work. The ivy file was found in the `repository` directory and the artifacts have been downloaded from ibiblio.
This kind of setup can be useful if you don't want to rely on the maven 2 repository for metadata, or if you want to take full advantage of Ivy files for some or all modules. Combining chain and dual resolvers should give you enough flexibility to meet almost any requirement.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/tutorial/multiple.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/multiple.adoc b/asciidoc/tutorial/multiple.adoc
index 328f852..e1707f3 100644
--- a/asciidoc/tutorial/multiple.adoc
+++ b/asciidoc/tutorial/multiple.adoc
@@ -45,11 +45,11 @@ It depends on two libraries: Apache's commons-lang and a custom library named te
Here is the content of the project:
-
+
* build.xml: the ant build file for the project +
-
+
* ivy.xml: the Ivy project file +
-
+
* src\example\Hello.java: the only class of the project +
Let's have a look at the *ivy.xml* file:
@@ -83,9 +83,9 @@ The settings are defined in the ivysettings.xml file located in the settings dir
<resolvers>
<chain name="chain-example">
<filesystem name="libraries">
- <artifact pattern="${ivy.settings.dir}/repository/[artifact]-[revision].[ext]" />
+ <artifact pattern="${ivy.settings.dir}/repository/[artifact]-[revision].[ext]"/>
</filesystem>
- <ibiblio name="ibiblio" m2compatible="true" />
+ <ibiblio name="ibiblio" m2compatible="true"/>
</chain>
</resolvers>
</ivysettings>
@@ -103,9 +103,9 @@ This tag initializes Ivy with some parameters. Here only one parameter is set, t
The resolvers section defines the list of resolvers that Ivy will use to locate artifacts. In our example, we have only one resolver named "chain-example", which is unique in that it defines a list (hence a chain) of resolvers.
The resolvers in this chain are:
-
+
* libraries : It is a filesystem resolver, so looks at a directory structure to retrieve the artifacts. This one is configured to look in the `repository` sub directory of the directory that contains the `ivysettings.xml` file. +
-
+
* ibiblio : It looks in the ibiblio maven repository to retrieve the artifacts. +
@@ -132,7 +132,7 @@ This will clean up the entire project directory tree and Ivy cache. You can do t
[NOTE]
====
-In almost all examples, we provide a clean target as default target. Since most examples use the same Ivy cache, you will clean the whole Ivy cache each time you call this target.
+In almost all examples, we provide a clean target as default target. Since most examples use the same Ivy cache, you will clean the whole Ivy cache each time you call this target.
Cleaning the Ivy cache is something you can do without fear (except performance): it's only a cache, so everything can be (and should be) obtained again from repositories. This may sound strange to those coming from maven 2 land. But remember that in Ivy, the cache is not a local repository and the two are completely isolated.
@@ -155,7 +155,7 @@ include::asciidoc/tutorial/log/chained-resolvers.txt[]
-We can see in the log of the resolve task, that the two dependencies have been retrieved (2 artifacts) and copied to the Ivy cache directory (2 downloaded).
+We can see in the log of the resolve task, that the two dependencies have been retrieved (2 artifacts) and copied to the Ivy cache directory (2 downloaded).
Also notice that the 'run' Ant target succeeded in using both commons-lang.jar coming from the ibiblio repository and test.jar coming from the local repository.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/tutorial/multiproject.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/multiproject.adoc b/asciidoc/tutorial/multiproject.adoc
index c2eee52..9877142 100644
--- a/asciidoc/tutorial/multiproject.adoc
+++ b/asciidoc/tutorial/multiproject.adoc
@@ -83,7 +83,7 @@ contains a directory per module, with each containing:
----
<ivy-module version="1.0">
- <info
+ <info
organisation="org.apache.ivy.example"
module="find"
status="integration"/>
@@ -92,13 +92,13 @@ contains a directory per module, with each containing:
<conf name="standalone" extends="core"/>
</configurations>
<publications>
- <artifact name="find" type="jar" conf="core" />
+ <artifact name="find" type="jar" conf="core"/>
</publications>
<dependencies>
- <dependency name="version" rev="latest.integration" conf="core->default" />
- <dependency name="list" rev="latest.integration" conf="core" />
- <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="core->default" />
- <dependency org="commons-cli" name="commons-cli" rev="1.0" conf="standalone->default" />
+ <dependency name="version" rev="latest.integration" conf="core->default"/>
+ <dependency name="list" rev="latest.integration" conf="core"/>
+ <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="core->default"/>
+ <dependency org="commons-cli" name="commons-cli" rev="1.0" conf="standalone->default"/>
</dependencies>
</ivy-module>
@@ -113,7 +113,7 @@ contains a directory per module, with each containing:
<project name="find" default="compile">
<property file="build.properties"/>
-
+
<import file="${common.dir}/common.xml"/>
</project>
@@ -154,7 +154,7 @@ So, here are some aspects of this common build file:
<property name="ivy.shared.default.root" value="${repository.dir}/shared"/>
<!-- here is how we would have configured ivy if we had our own ivysettings file
-<ivy:settings file="${common.dir}/ivysettings.xml" id="ivy.instance" />
+<ivy:settings file="${common.dir}/ivysettings.xml" id="ivy.instance"/>
-->
----
@@ -171,10 +171,10 @@ Commented out you can see how the settings would have been done if the default s
<target name="resolve" depends="clean-lib, load-ivy" description="--> resolve and retrieve dependencies with ivy">
<mkdir dir="${lib.dir}"/> <!-- not usually necessary, ivy creates the directory IF there are dependencies -->
-
+
<!-- the call to resolve is not mandatory, retrieve makes an implicit call if we don't -->
<ivy:resolve file="${ivy.file}"/>
- <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" />
+ <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]"/>
</target>
----
@@ -190,12 +190,12 @@ You should begin to be familiar with using Ivy this way. We call __resolve__ exp
<target name="ivy-new-version" depends="load-ivy" unless="ivy.new.revision">
<!-- default module version prefix value -->
- <property name="module.version.prefix" value="${module.version.target}-dev-b" />
-
+ <property name="module.version.prefix" value="${module.version.target}-dev-b"/>
+
<!-- asks Ivy for an available version number -->
- <ivy:info file="${ivy.file}" />
- <ivy:buildnumber
- organisation="${ivy.organisation}" module="${ivy.module}"
+ <ivy:info file="${ivy.file}"/>
+ <ivy:buildnumber
+ organisation="${ivy.organisation}" module="${ivy.module}"
revision="${module.version.prefix}" defaultBuildNumber="1" revSep=""/>
</target>
@@ -211,12 +211,11 @@ This target is used to ask Ivy to find a new version for a module. To get detail
----
<target name="publish" depends="clean-build, jar" description="--> publish this project in the ivy repository">
- <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
+ <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
resolver="shared"
- pubrevision="${version}"
- status="release"
- />
- <echo message="project ${ant.project.name} released with version ${version}" />
+ pubrevision="${version}"
+ status="release"/>
+ <echo message="project ${ant.project.name} released with version ${version}"/>
</target>
----
@@ -230,14 +229,13 @@ This target publishes the module to the shared repository, with the revision fou
----
<target name="publish-local" depends="local-version, jar" description="--> publish this project in the local ivy repository">
- <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
+ <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
resolver="local"
pubrevision="${version}"
pubdate="${now}"
status="integration"
- forcedeliver="true"
- />
- <echo message="project ${ant.project.name} published locally with version ${version}" />
+ forcedeliver="true"/>
+ <echo message="project ${ant.project.name} published locally with version ${version}"/>
</target>
----
@@ -272,7 +270,7 @@ This target is used when you don't want to use your local version of a module an
Generates both an html report and a graphml report.
-For example, to generate a graph like the one shown at the beginning of this tutorial, you just have to follow the instructions given link:../yed.html[here] with the graphml file you will find in
+For example, to generate a graph like the one shown at the beginning of this tutorial, you just have to follow the instructions given link:../yed.html[here] with the graphml file you will find in
[source]
----
projects/console/build/
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/tutorial/start.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/start.adoc b/asciidoc/tutorial/start.adoc
index e406ffa..4471a65 100644
--- a/asciidoc/tutorial/start.adoc
+++ b/asciidoc/tutorial/start.adoc
@@ -17,7 +17,7 @@
under the License.
////
-In this tutorial, you will see one of the simplest ways to use Ivy. With no specific settings, Ivy uses the maven 2 repository to resolve the dependencies you declare in an Ivy file. Let's have a look at the content of the files involved.
+In this tutorial, you will see one of the simplest ways to use Ivy. With no specific settings, Ivy uses the maven 2 repository to resolve the dependencies you declare in an Ivy file. Let's have a look at the content of the files involved.
_You'll find this tutorial's sources in the ivy distribution in the src/example/hello-ivy directory._
@@ -25,7 +25,7 @@ _You'll find this tutorial's sources in the ivy distribution in the src/example/
== The ivy.xml file
This file is used to describe the dependencies of the project on other libraries.
-Here is the sample:
+Here is the sample:
[source]
----
@@ -40,11 +40,11 @@ Here is the sample:
----
-The format of this file should pretty easy to understand, but let's give some details about what is declared here. First, the root element ivy-module, with the version attribute used to tell Ivy which version of Ivy this file uses.
+The format of this file should pretty easy to understand, but let's give some details about what is declared here. First, the root element ivy-module, with the version attribute used to tell Ivy which version of Ivy this file uses.
Then there is an info tag, which is used to give information about the module for which we are defining dependencies. Here we define only the organization and module name. You are free to choose whatever you want for them, but we recommend avoiding spaces for both.
-Finally, the dependencies section lets you define dependencies. Here this module depends on two libraries: commons-lang and commons-cli. As you can see, we use the `org` and `name` attributes to define the organization and module name of the dependencies we need. The `rev` attribute is used to specify the version of the module you depend on.
+Finally, the dependencies section lets you define dependencies. Here this module depends on two libraries: commons-lang and commons-cli. As you can see, we use the `org` and `name` attributes to define the organization and module name of the dependencies we need. The `rev` attribute is used to specify the version of the module you depend on.
To know what to put in these attributes, you need to know the exact information for the libraries you depend on. Ivy uses the maven 2 repository by default, so we recommend you use link:http://mvnrepository.com[mvnrepository.com] to look for the module you want. Once you find it, you will have the details on how to declare the dependency in a maven POM. For instance:
@@ -72,14 +72,14 @@ You can use the standard "ant -p" to get the list of available targets. Feel fre
----
<project xmlns:ivy="antlib:org.apache.ivy.ant" name="hello-ivy" default="run">
-
+
...
-
- <!-- =================================
- target: resolve
+
+ <!-- =================================
+ target: resolve
================================= -->
<target name="resolve" description="--> retrieve dependencies with ivy">
- <ivy:retrieve />
+ <ivy:retrieve/>
</target>
</project>
@@ -107,7 +107,7 @@ include::asciidoc/tutorial/log/hello-ivy-1.txt[]
== What happened ?
-Without any settings, Ivy retrieves files from the maven 2 repository. That's what happened here.
+Without any settings, Ivy retrieves files from the maven 2 repository. That's what happened here.
The resolve task has found the commons-lang and commons-cli modules in the maven 2 repository, identified that commons-cli depends on commons-logging and so resolved it as a transitive dependency. Then Ivy has downloaded all corresponding artifacts in its cache (by default in your user home, in a .ivy2/cache directory). Finally, the retrieve task copies the resolved jars from the ivy cache to the default library directory of the project: the lib dir (you can change this easily by setting the pattern attribute on the link:../use/retrieve.html[retrieve] task).
You might say that the task took a long time just to write out a "Hello Ivy!" message. But remember that a lot of time was spent downloading the required files from the web. Let's try to run it again:
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/artifactproperty.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/artifactproperty.adoc b/asciidoc/use/artifactproperty.adoc
index a962f82..dd24317 100644
--- a/asciidoc/use/artifactproperty.adoc
+++ b/asciidoc/use/artifactproperty.adoc
@@ -52,7 +52,7 @@ Then:
[source,xml]
----
<artifactproperty conf="build"
- name="[module].[artifact]-[revision]"
+ name="[module].[artifact]-[revision]"
value="${cache.dir}/[module]/[artifact]-[revision].[ext]"/>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/artifactreport.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/artifactreport.adoc b/asciidoc/use/artifactreport.adoc
index 6051e78..64048d8 100644
--- a/asciidoc/use/artifactreport.adoc
+++ b/asciidoc/use/artifactreport.adoc
@@ -22,7 +22,7 @@ The `artifactreport` task generates an xml report of all artifacts dependencies
*__since 2.0__* This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and attributes common to all post resolve tasks.
-This report is different from the standard link:../use/report.html[report] which reports all modules and artifacts, whle this report is much simpler and focuses only on artifacts, and gives more information on artifacts, such as the original location and the retrieve location.
+This report is different from the standard link:../use/report.html[report] which reports all modules and artifacts, while this report is much simpler and focuses only on artifacts, and gives more information on artifacts, such as the original location and the retrieve location.
It is thus easy to use to generate things like a classpath file for an IDE.
@@ -76,7 +76,7 @@ Here is an example of generate file:
[source,xml]
----
-<ivy:artifactreport tofile="${basedir}/path/to/myreport.xml" />
+<ivy:artifactreport tofile="${basedir}/path/to/myreport.xml"/>
----
Generates the artifact report for all configurations resolved during the last resolve call (in the same build).
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/buildlist.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/buildlist.adoc b/asciidoc/use/buildlist.adoc
index 54a4055..45f47ab 100644
--- a/asciidoc/use/buildlist.adoc
+++ b/asciidoc/use/buildlist.adoc
@@ -19,7 +19,7 @@
The `buildlist` task enable to obtain a `filelist` of files (usually `build.xml` files) ordered according to Ivy dependency information from the least dependent to the most one, or the inverse. (*__since 1.2__*)
-This is particularly useful combined with `subant`, to build a set of interelated projects being sure that a dependency will be built before any module depending on it.
+This is particularly useful combined with `subant`, to build a set of interrelated projects being sure that a dependency will be built before any module depending on it.
When the `ivy.xml` of the modules that you want to order doesn't contains a link:../ivyfile/info.html[revision] numbers, the `rev` attributes declared in the dependency is not used.
When the `ivy.xml` of the modules that you want to order contains a link:../ivyfile/info.html[revision] numbers, the revision numbers are used. If the revision number doesn't match a dependency description a warning is logged and the modules is considered as different modules.
@@ -32,7 +32,7 @@ When the `ivy.xml` of the modules that you want to order contains a link:../ivyf
*__since 2.0__* The `root` and `leaf` attributes can be a delimited list of modules to use as roots. These modules, and all their dependencies will be included in the build list.
-*__since 2.0__* By default, all the modules included in a circular dependency are grouped together so that any dependency of any module in the loop will apear before the modules in the loop. This garantee that if there is a depedendency path between a module A and a module B (but no dependency path from B to A), B will alway apear before A even if A is included in a loop in the provided set of modules to sort.
+*__since 2.0__* By default, all the modules included in a circular dependency are grouped together so that any dependency of any module in the loop will appear before the modules in the loop. This guarantee that if there is a dependency path between a module A and a module B (but no dependency path from B to A), B will always appear before A even if A is included in a loop in the provided set of modules to sort.
Note that circular dependency can also trigger a failure depending on the value configured in the `circularDependencyStrategy` of your link:../settings/conf.html#circularDependencyStrategy[settings]
*__since 2.0__* When you are specifying `root` or `leaf` modules you can limit the resulting list to only direct dependencies of the roots modules or to modules that directly depends on your leaf modules.
@@ -50,7 +50,7 @@ Note that circular dependency can also trigger a failure depending on the value
*__since 1.3__* Was limited to only one module name before 2.0.|No. Defaults to no root (all modules are used in the build list)
|excluderoot|*__since 1.3__* `true` if the root defined should be excluded from the list|No. Defaults to `false`
-|leaf|*__since 2.0__* the names of the modules which should be considered as the leaf of the buildlist.
+|leaf|*__since 2.0__* the names of the modules which should be considered as the leaf of the buildlist.
*__since 1.4.1__* Was limited to only one module name before 2.0.|No. Defaults to no leaf (all modules are used in the build list)
|onlydirectdep|*__since 2.0__* `true` if the
resulting list should be restricted to direct dependencies of root modules or modules that directly depends on the leaf modules.
@@ -69,7 +69,7 @@ This field is ignored when neither root neither leaf is filled.
* `fail`: halt the build with a failure.
|No. Defaults to `head`
|reverse|`true` to obtain the list in the reverse order, i.e. from the most dependent to the least one|No. Defaults to default `false`
-|restartFrom|*__since 2.0__* The name of the module which should be considered as the starting point in the buildlist. This allows for the build to be started at any point in the dependency chain.
+|restartFrom|*__since 2.0__* The name of the module which should be considered as the starting point in the buildlist. This allows for the build to be started at any point in the dependency chain.
|No. Defaults to `*` meaning no restart point (all modules are used in the build list).
|settingsRef|*__since 2.0__* A reference to the ivy settings that must be used by this task|No, `ivy.instance` is taken by default.
|=======
@@ -95,7 +95,7 @@ This list can then be used like that:
[source,xml]
----
- <subant target="build" buildpathref="build-path" />
+ <subant target="build" buildpathref="build-path"/>
----
'''
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/buildnumber.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/buildnumber.adoc b/asciidoc/use/buildnumber.adoc
index 5270470..6560f9e 100644
--- a/asciidoc/use/buildnumber.adoc
+++ b/asciidoc/use/buildnumber.adoc
@@ -75,7 +75,7 @@ Here is how it can be used (suppose 1.3.1 is the latest version of ivy in the re
[source,xml]
----
-<ivy:buildnumber organisation="apache" module="ivy" />
+<ivy:buildnumber organisation="apache" module="ivy"/>
----
will set 1.3.1 as revision, 1.3.2 as new revision, 1 as build number and 2 as new build number
@@ -84,7 +84,7 @@ will set 1.3.1 as revision, 1.3.2 as new revision, 1 as build number and 2 as ne
[source,xml]
----
-<ivy:buildnumber organisation="apache" module="ivy" revision="1.3" />
+<ivy:buildnumber organisation="apache" module="ivy" revision="1.3"/>
----
will set 1.3.1 as revision, 1.3.2 as new revision, 1 as build number and 2 as new build number
@@ -93,7 +93,7 @@ will set 1.3.1 as revision, 1.3.2 as new revision, 1 as build number and 2 as ne
[source,xml]
----
-<ivy:buildnumber organisation="apache" module="ivy" revision="1.2" />
+<ivy:buildnumber organisation="apache" module="ivy" revision="1.2"/>
----
will set 1.2 as revision, 1.2.1 as new revision, no build number and 1 as new build number
@@ -102,7 +102,7 @@ will set 1.2 as revision, 1.2.1 as new revision, no build number and 1 as new bu
[source,xml]
----
-<ivy:buildnumber organisation="apache" module="ivy" revision="1." />
+<ivy:buildnumber organisation="apache" module="ivy" revision="1."/>
----
will set 1.3.1 as revision, 1.4 as new revision, 3 as build number and 4 as new build number
@@ -111,7 +111,7 @@ will set 1.3.1 as revision, 1.4 as new revision, 3 as build number and 4 as new
[source,xml]
----
-<ivy:buildnumber organisation="apache" module="ivy" revision="3." />
+<ivy:buildnumber organisation="apache" module="ivy" revision="3."/>
----
will set no revision, 3.0 as new revision, no build number and 0 as new build number
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/buildobr.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/buildobr.adoc b/asciidoc/use/buildobr.adoc
index ce746a0..cdc0fd5 100644
--- a/asciidoc/use/buildobr.adoc
+++ b/asciidoc/use/buildobr.adoc
@@ -26,7 +26,7 @@ The set of jars which will be described by the OBR can be defined in 4 exclusive
* via the name of an Ivy cache: every artifact contained in the cache will be taken into account
* *__since 2.4__* via a resolve: this task is a link:../use/postresolvetask.html[post resolve task] (with all the behaviour and attributes common to all post resolve tasks), thus ever artifact which has been resolved will be taken into account; it is especially useful for building a link:../osgi/target-platform.html[target platform]
-NB: among every listed files or artifacts, only the actually OSGi bundles will be described by the OBR descriptor; the other files are ignored.
+NB: among every listed files or artifacts, only the actually OSGi bundles will be described by the OBR descriptor; the other files are ignored.
== Attributes
@@ -42,14 +42,14 @@ NB: among every listed files or artifacts, only the actually OSGi bundles will b
|sourceType|if used as a post resolve task, `sourceType` define the type of artifacts which should be considered as source artifacts|No. Defaults to `source,sources,src`
|encoding|The encoding of the resulting xml file|No. Defaults to `UTF-8`
|indent|Specify if the xml result file should be indented|No. Defaults to `true`
-|quiet|Log as debug rather than warning the rejected jars as they are illformed|No. Defaults to `false`
+|quiet|Log as debug rather than warning the rejected jars as they are ill-formed|No. Defaults to `false`
|=======
== Examples
[source,xml]
----
- <ivy:buildobr baseDir="${eclipse.home}" out="${basedir}/target/repo-eclipse.xml" indent="true" />
+ <ivy:buildobr baseDir="${eclipse.home}" out="${basedir}/target/repo-eclipse.xml" indent="true"/>
----
Builds an indented OBR descriptor from an Eclipse install, with their path relative to the Eclipse install.
@@ -58,8 +58,8 @@ Builds an indented OBR descriptor from an Eclipse install, with their path relat
[source,xml]
----
- <ivy:configure file="ivysettings.xml" />
- <ivy:buildobr resolverName="my-file-resolver" out="${basedir}/target/repo-eclipse.xml" />
+ <ivy:configure file="ivysettings.xml"/>
+ <ivy:buildobr resolverName="my-file-resolver" out="${basedir}/target/repo-eclipse.xml"/>
----
Configure an Ivy settings and builds an OBR descriptor from jars resolved by the defined resolver.
@@ -68,8 +68,8 @@ Configure an Ivy settings and builds an OBR descriptor from jars resolved by the
[source,xml]
----
- <ivy:configure file="ivysettings.xml" />
- <ivy:buildobr cacheName="my-cache" out="${basedir}/target/repo-eclipse.xml" />
+ <ivy:configure file="ivysettings.xml"/>
+ <ivy:buildobr cacheName="my-cache" out="${basedir}/target/repo-eclipse.xml"/>
----
Configure an Ivy settings and builds an OBR descriptor from jars contained in the defined cache.
@@ -78,9 +78,9 @@ Configure an Ivy settings and builds an OBR descriptor from jars contained in th
[source,xml]
----
- <ivy:configure file="ivysettings.xml" />
- <ivy:resolve file="ivy.xml" />
- <ivy:buildobr out="${basedir}/target-platform-obr.xml" />
+ <ivy:configure file="ivysettings.xml"/>
+ <ivy:resolve file="ivy.xml"/>
+ <ivy:buildobr out="${basedir}/target-platform-obr.xml"/>
----
Launch a resolve and then build an obr.xml describing the resolved artifacts.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/cachefileset.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/cachefileset.adoc b/asciidoc/use/cachefileset.adoc
index 2902ab9..0e5b0af 100644
--- a/asciidoc/use/cachefileset.adoc
+++ b/asciidoc/use/cachefileset.adoc
@@ -20,7 +20,7 @@
Constructs an Ant `fileset consisting` of artifacts in Ivy's cache for a configuration (*__since 1.2__*).
This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and attributes common to all post resolve tasks. Note that this task
-does not rely on retrieve, because built fileset is made of artifacts direcly in Ivy's cache.
+does not rely on retrieve, because built fileset is made of artifacts directly in Ivy's cache.
Please prefer the use of retrieve + standard ant path creation, which make your build
more independent from Ivy (once artifacts are properly retrieved, Ivy is not required any more).
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/cachepath.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/cachepath.adoc b/asciidoc/use/cachepath.adoc
index 9903993..0cc66ee 100644
--- a/asciidoc/use/cachepath.adoc
+++ b/asciidoc/use/cachepath.adoc
@@ -40,7 +40,7 @@ Built path is registered in ant with a given id, and can thus be used like any o
[source,xml]
----
-<cachepath pathid="default.classpath" conf="default" />
+<cachepath pathid="default.classpath" conf="default"/>
----
Construct an Ant path composed of all artifacts being part of the default configuration obtained through the last resolve call.
@@ -49,7 +49,7 @@ Construct an Ant path composed of all artifacts being part of the default config
[source,xml]
----
-<cachepath pathid="default.classpath" conf="default" useOrigin="true" />
+<cachepath pathid="default.classpath" conf="default" useOrigin="true"/>
----
Same as before but will use the original location for local artifacts, and the cache location for other artifacts.
@@ -59,7 +59,7 @@ Same as before but will use the original location for local artifacts, and the c
[source,xml]
----
<ivy:cachepath organisation="emma" module="emma" revision="2.0.4217" inline="true" conf="ant" pathid="emma.classpath"/>
-<taskdef resource="emma_ant.properties" classpathref="emma.classpath" />
+<taskdef resource="emma_ant.properties" classpathref="emma.classpath"/>
----
Resolves the Emma module in version 2.0.4217, constructs an Ant path with the corresponding artifacts, and then define the Emma tasks using this path.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/checkdepsupdate.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/checkdepsupdate.adoc b/asciidoc/use/checkdepsupdate.adoc
index f418fab..bb7bafb 100644
--- a/asciidoc/use/checkdepsupdate.adoc
+++ b/asciidoc/use/checkdepsupdate.adoc
@@ -43,7 +43,7 @@ Then:
[source,xml]
----
-<checkdepsupdate />
+<checkdepsupdate/>
----
will display the following updates in the console:
@@ -59,7 +59,7 @@ Same example with transitive dependencies :
[source,xml]
----
-<checkdepsupdate showTransitive="true" />
+<checkdepsupdate showTransitive="true"/>
----
will display the following updates in the console:
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/cleancache.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/cleancache.adoc b/asciidoc/use/cleancache.adoc
index cca9fdb..473ca9a 100644
--- a/asciidoc/use/cleancache.adoc
+++ b/asciidoc/use/cleancache.adoc
@@ -24,10 +24,10 @@ This task is roughly equivalent to:
[source,xml]
----
-<delete dir="${ivy.cache.dir}" />
+<delete dir="${ivy.cache.dir}"/>
----
-Using the regular Ant delete task is more flexible, since it allows to specify the files to delete. But it requires an Ivy settings to be loaded, and settings scoping is possible only by using suffixed ant property for the cache directory.
+Using the regular Ant delete task is more flexible, since it allows to specify the files to delete. But it requires an Ivy settings to be loaded, and settings scoping is possible only by using suffixed ant property for the cache directory.
This task loads the Ivy settings as any other post settings task, and allows easy scoping with the attribute `settingsRef`.
@@ -43,7 +43,7 @@ This task loads the Ivy settings as any other post settings task, and allows eas
[source,xml]
----
-<ivy:cleancache />
+<ivy:cleancache/>
----
Cleans the cache directory as defined in the loaded settings (by default `~/.ivy2/cache`)
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/configure.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/configure.adoc b/asciidoc/use/configure.adoc
index 1413ac5..cdcbeb0 100644
--- a/asciidoc/use/configure.adoc
+++ b/asciidoc/use/configure.adoc
@@ -30,7 +30,7 @@ See link:../settings.html[Settings Files] for details about the settings file it
[options="header",cols="15%,50%,35%"]
|=======
|Attribute|Description|Required
-|settingsId|The settings id useable in the `settingsRef` attributes of the Ivy task that needs a setting.|No, defaults to `ivy.instance`
+|settingsId|The settings id usable in the `settingsRef` attributes of the Ivy task that needs a setting.|No, defaults to `ivy.instance`
|file|path to the settings file to use
.2+|No. If a file is provided, url is ignored. If none are provided, then it attempts to find a file at `${ivy.settings.file}`, and if this file does not exist, it uses `${ivy.settings.url}` *__(since 2.3)__* or a link:../samples/ivysettings-default.xml[default settings file]
|url|url of the settings file to use
@@ -58,7 +58,7 @@ It's also possible to configure authentication settings for multiple urls. This
[source,xml]
----
-<ivy:configure />
+<ivy:configure/>
----
Use either `${ivy.settings.file}` if it exists, or the link:../samples/ivysettings-default.xml[default settings file]
@@ -67,22 +67,22 @@ Use either `${ivy.settings.file}` if it exists, or the link:../samples/ivysettin
[source,xml]
----
-<ivy:configure file="myconffile.xml" />
+<ivy:configure file="myconffile.xml"/>
----
=== Configure with an url
[source,xml]
----
-<ivy:configure url="http://mysite.com/myconffile.xml" />
+<ivy:configure url="http://mysite.com/myconffile.xml"/>
----
-=== Configure multiple URLs which require autentication
+=== Configure multiple URLs which require authentication
[source,xml]
----
<ivy:configure file="path/to/my/ivysettings.xml">
- <credentials host="myhost.com" realm="My Realm" username="myuser" passwd="mypasswd" />
- <credentials host="yourhost.com" realm="Your Realm" username="myuser" passwd="myotherpasswd" />
-</ivy:configure>
+ <credentials host="myhost.com" realm="My Realm" username="myuser" passwd="mypasswd"/>
+ <credentials host="yourhost.com" realm="Your Realm" username="myuser" passwd="myotherpasswd"/>
+</ivy:configure>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/convertmanifest.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/convertmanifest.adoc b/asciidoc/use/convertmanifest.adoc
index 29d8a27..00f3219 100644
--- a/asciidoc/use/convertmanifest.adoc
+++ b/asciidoc/use/convertmanifest.adoc
@@ -32,7 +32,7 @@
[source,xml]
----
- <ivy:convertmanifest manifest="META-INF/MANIFEST.MF" ivyFile="ivy.xml" />
+ <ivy:convertmanifest manifest="META-INF/MANIFEST.MF" ivyFile="ivy.xml"/>
----
Just converts a manifest into an `ivy.xml` file.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/convertpom.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/convertpom.adoc b/asciidoc/use/convertpom.adoc
index 5204317..b593584 100644
--- a/asciidoc/use/convertpom.adoc
+++ b/asciidoc/use/convertpom.adoc
@@ -32,7 +32,7 @@
[source,xml]
----
- <ivy:convertpom pomFile="pom.xml" ivyFile="ivy.xml" />
+ <ivy:convertpom pomFile="pom.xml" ivyFile="ivy.xml"/>
----
Just convert an pom.xml file into an ivy.xml.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/deliver.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/deliver.adoc b/asciidoc/use/deliver.adoc
index 6bb38c1..da473e1 100644
--- a/asciidoc/use/deliver.adoc
+++ b/asciidoc/use/deliver.adoc
@@ -35,12 +35,12 @@ Finally, in the resolved ivy file, dynamic revisions are replaced by the static
This is done only if a deliver target is given to the deliver task.
-If a deliver target is set, then it is called (via an `antcall`) for each dependency which has not a suffisant status compared to the deliver status set for this task. This means that if you deliver an integration revision, no recursive delivery will be done.
+If a deliver target is set, then it is called (via an `antcall`) for each dependency which has not a sufficient status compared to the deliver status set for this task. This means that if you deliver an integration revision, no recursive delivery will be done.
-If you deliver a milestone or a release revision, deliver target will be called with each integration dependency.
+If you deliver a milestone or a release revision, deliver target will be called with each integration dependency.
The deliver target is called with the following properties available:
-
+
* `dependency.name`: the name of the dependency to recursively deliver
* `dependency.published.status`: the status to which the dependency should be delivered
* `dependency.published.version`: the revision to which the dependency should be delivered
@@ -57,7 +57,7 @@ The delivered ivy file will update its dependency revisions with those given her
== deliver and publish
-The `deliver` task is most of the time not called explicitly, but rather called automatically by the link:../use/publish.html[publish] task. So, when shall the deliver task be called explictly? When you actually need to separate what is performed by the deliver task (see above), from what is performed by the `publish` task, i.e. upload a module to a repository.
+The `deliver` task is most of the time not called explicitly, but rather called automatically by the link:../use/publish.html[publish] task. So, when shall the deliver task be called explicitly? When you actually need to separate what is performed by the deliver task (see above), from what is performed by the `publish` task, i.e. upload a module to a repository.
And this can be particularly useful if you want to process the generated ivy file before uploading it (if you want to add automatically more information like an SCM tag used, the user who performed the release, ...).
@@ -87,7 +87,7 @@ It can also be useful if you want to trigger a recursive delivery and then ensur
|merge|if a descriptor link:../ivyfile/extends.html[extends] a parent, merge the inherited information directly into the delivered descriptor. The `extends` element itself will be commented out in the delivered descriptor. *__(since 2.2)__*|No. Defaults to `true`.
|settingsRef|A reference to the ivy settings that must be used by this task *__(since 2.0)__*|No. Defaults to `ivy.instance`.
|conf|comma-separated list of configurations to include in the delivered file. Accepts wildcards. *__(since 2.0)__*|No. Defaults to all configurations
-|generateRevConstraint|`true` to automatically generate a `revConstraint attribute in the deliverd file (see the link:../ivyfile/dependency.html[dependency] page for more info about this attribute), `false` to never generate this attribute *__(since 2.1.0)__*|No. Defaults to `true`
+|generateRevConstraint|`true` to automatically generate a `revConstraint attribute in the delivered file (see the link:../ivyfile/dependency.html[dependency] page for more info about this attribute), `false` to never generate this attribute *__(since 2.1.0)__*|No. Defaults to `true`
|=======
== Example
@@ -96,5 +96,5 @@ Deliver an ivy file without the private configurations:
[source,xml]
----
-<deliver conf="*(public)" />
+<deliver conf="*(public)"/>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/dependencytree.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/dependencytree.adoc b/asciidoc/use/dependencytree.adoc
index 99493d3..a036564 100644
--- a/asciidoc/use/dependencytree.adoc
+++ b/asciidoc/use/dependencytree.adoc
@@ -45,7 +45,7 @@ Then:
[source,xml]
----
-<dependencytree />
+<dependencytree/>
----
will display the following tree in the console:
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/fixdeps.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/fixdeps.adoc b/asciidoc/use/fixdeps.adoc
index 51c553a..ebf3282 100644
--- a/asciidoc/use/fixdeps.adoc
+++ b/asciidoc/use/fixdeps.adoc
@@ -20,7 +20,7 @@
*__since 2.4__*
The `fixdeps` task serializes transitively resolved dependencies into an `ivy.xml` file.
-The dependencies declared in an `ivy.xml` can be specified as range of revisions. And the transitive dependencies too. As new versions of modules can be added to the repository anytime, resolved versions of ranges can change over time. It is then safer to resolve a range once and stick with the resolved revision. This way a resolve process is highly reproductible.
+The dependencies declared in an `ivy.xml` can be specified as range of revisions. And the transitive dependencies too. As new versions of modules can be added to the repository anytime, resolved versions of ranges can change over time. It is then safer to resolve a range once and stick with the resolved revision. This way a resolve process is highly reproducible.
It is especially useful in a very dynamic environment like the link:../osgi.html[OSGi] one.
@@ -48,7 +48,7 @@ This is a link:../use/postresolvetask.html[post resolve task], with all the beha
|=======
|Element|Description|Cardinality
|keep|declares a dependency to keep from being fixed, and keep its original declaration from the original ivy.xml
-
+
These elements takes two attributes: +
* `org`: the organization +
* `module`: the name of the module|0..n
@@ -58,7 +58,7 @@ These elements takes two attributes: +
[source,xml]
----
-<ivy:fixdeps tofile="ivy-fixed.xml" />
+<ivy:fixdeps tofile="ivy-fixed.xml"/>
----
Simple fix of some dependencies.
@@ -68,7 +68,7 @@ Simple fix of some dependencies.
[source,xml]
----
<ivy:fixdeps tofile="ivy-fixed.xml">
- <keep org="com.acme" module="mymodule" />
+ <keep org="com.acme" module="mymodule"/>
</ivy:fixdeps>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/info.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/info.adoc b/asciidoc/use/info.adoc
index 385c1e5..40c30bc 100644
--- a/asciidoc/use/info.adoc
+++ b/asciidoc/use/info.adoc
@@ -89,8 +89,8 @@ Given this `ivy.xml` file:
e:myextraatt="myvalue"
/>
<configurations>
- <conf name="default" />
- <conf name="test" />
+ <conf name="default"/>
+ <conf name="test"/>
<conf name="private" visibility="private"/>
</configurations>
<publications>
@@ -105,7 +105,7 @@ Given this `ivy.xml` file:
[source,xml]
----
-<ivy:info file="${basedir}/path/to/ivy.xml" />
+<ivy:info file="${basedir}/path/to/ivy.xml"/>
----
Parses `+++${basedir}/path/to/ivy.xml+++` and set properties as described above accordingly:
@@ -136,7 +136,7 @@ Given the same ivy module in a repository:
[source,xml]
----
-<ivy:info organisation="apache" module="info-all" revision="1.0" />
+<ivy:info organisation="apache" module="info-all" revision="1.0"/>
----
will set the exact same set of properties as above. Using:
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/makepom.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/makepom.adoc b/asciidoc/use/makepom.adoc
index 1a03e37..ddf0a21 100644
--- a/asciidoc/use/makepom.adoc
+++ b/asciidoc/use/makepom.adoc
@@ -28,14 +28,14 @@ _Note that all Ivy features are not supported by maven poms, so the converted po
It is possible to specify a template file defining the structure of the generated POM. The following processing is done on this template:
* properties like `${property.name}` are replaced if they are defined in Ant or by the `ivy:makepom` task (see below for the standard properties)
-* lines containg the string `SKIP_LINE` are skipped.
+* lines containing the string `SKIP_LINE` are skipped.
* the defined dependencies will be added to the first `<dependencies>` element encountered in the pom template. If the template doesn't contain a `<dependencies>` element, it is generated a the end of the pom.
The `ivy:makepom` task defines following properties that can be used in the template.
* `ivy.pom.groupId`: defaults to the organisation as defined in the ivy.xml file
-* `ivy.pom.artifactId`: defaults to the value of the `atifactName` attribute of this task, or the name of the module as defined in the ivy.xml file
-* `ivy.pom.packaging`: defaults to the value of the `artifactPackaging` attribute of this task, or the extenstion of the artifact
+* `ivy.pom.artifactId`: defaults to the value of the `artifactName` attribute of this task, or the name of the module as defined in the ivy.xml file
+* `ivy.pom.packaging`: defaults to the value of the `artifactPackaging` attribute of this task, or the extension of the artifact
* `ivy.pom.version`: defaults to the revision as defined in the ivy.xml file
* `ivy.pom.name`: defaults to `SKIP_LINE`
* `ivy.pom.description`: defaults to the value of the `description` attribute of this task, or `SKIP_LINE` when not specified +
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/postresolvetask.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/postresolvetask.adoc b/asciidoc/use/postresolvetask.adoc
index 232b969..f4ae1ad 100644
--- a/asciidoc/use/postresolvetask.adoc
+++ b/asciidoc/use/postresolvetask.adoc
@@ -54,7 +54,7 @@ The attributes listed are then mostly used only if a resolve is triggered automa
|changing|indicates that the module may change when resolving in inline mode. See link:../concept.html#change[cache and change management] for details. Ignored when resolving in standard mode. *__(since 2.2.0)__*|No. Defaults to `false`.
|transitive|`true` to resolve dependencies transitively, `false` otherwise *__since 1.4__*|No. Defaults to `true`
|resolveMode|the link:../use/resolve.html[resolve mode] to use when an automatic resolve is triggered *__(since 2.1)__*|No. defaults to using the resolve mode set in the link:../settings.html[settings]
-|keep|`true` to keep the results of the automatic resolve in memory, `false` to discard them. When this is `false`, the standard ivy properties won't be set and other post-resolve tasks (like `retrieve` and `cachepath`) won't be able to resuse the results of this resolve!|No. defaults to `false` for an inline resolve and to `true` in any other case
+|keep|`true` to keep the results of the automatic resolve in memory, `false` to discard them. When this is `false`, the standard ivy properties won't be set and other post-resolve tasks (like `retrieve` and `cachepath`) won't be able to reuse the results of this resolve!|No. defaults to `false` for an inline resolve and to `true` in any other case
|haltonfailure|`true` to halt the build on ivy failure, `false` to continue|No. Defaults to `true`
|validate|`true` to force ivy files validation against ivy.xsd, `false` to force no validation|No. Defaults to default ivy value (as configured in configuration file)
|refresh|`true` to force Ivy to resolve dynamic revision in this resolve process, `false` to use cached resolved revision *__since 2.1__*|No. defaults to `false`
@@ -91,7 +91,7 @@ There is one important difference with the ivy.xml's link:../ivyfile/dependencie
[source,xml]
----
<ivy:cachepath organisation="emma" module="emma" revision="2.0.4217" inline="true" conf="ant" pathid="emma.classpath"/>
-<taskdef resource="emma_ant.properties" classpathref="emma.classpath" />
+<taskdef resource="emma_ant.properties" classpathref="emma.classpath"/>
----
Resolves the Emma module in version 2.0.4217, constructs an Ant path with the corresponding artifacts, and then define the Emma tasks using this path.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/publish.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/publish.adoc b/asciidoc/use/publish.adoc
index 61f27dc..7f61f26 100644
--- a/asciidoc/use/publish.adoc
+++ b/asciidoc/use/publish.adoc
@@ -75,8 +75,8 @@ The source artifact pattern can be specified either as an attribute on the task
[source,xml]
----
<ivy:publish resolver="local" pubrevision="1.0">
- <artifacts pattern="build/artifacts/jars/[artifact].[ext]" />
- <artifacts pattern="build/artifacts/zips/[artifact].[ext]" />
+ <artifacts pattern="build/artifacts/jars/[artifact].[ext]"/>
+ <artifacts pattern="build/artifacts/zips/[artifact].[ext]"/>
</ivy:publish>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/report.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/report.adoc b/asciidoc/use/report.adoc
index fe16ee6..9a64f6f 100644
--- a/asciidoc/use/report.adoc
+++ b/asciidoc/use/report.adoc
@@ -54,7 +54,7 @@ To generate a HTML and graphml report:
[source,xml]
----
-<report conf="compile" />
+<report conf="compile"/>
----
'''
@@ -63,7 +63,7 @@ To generate a HTML report only:
[source,xml]
----
-<report conf="compile" graph="false" />
+<report conf="compile" graph="false"/>
----
'''
@@ -72,7 +72,7 @@ To generate an XML report using a custom stylesheet:
[source,xml]
----
-<report conf="compile" xslfile="my-custom-stylesheet.xsl" xslext="xml" />
+<report conf="compile" xslfile="my-custom-stylesheet.xsl" xslext="xml"/>
----
To generate an XML report using a custom stylesheet which needs some parameters:
@@ -80,7 +80,7 @@ To generate an XML report using a custom stylesheet which needs some parameters:
[source,xml]
----
<report conf="compile" xslfile="my-custom-stylesheet.xsl" xslext="xml">
- <param name="param1" expression="value1" />
- <param name="param2" expression="value2" />
+ <param name="param1" expression="value1"/>
+ <param name="param2" expression="value2"/>
</report>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/repreport.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/repreport.adoc b/asciidoc/use/repreport.adoc
index b29e43a..1668dc8 100644
--- a/asciidoc/use/repreport.adoc
+++ b/asciidoc/use/repreport.adoc
@@ -56,7 +56,7 @@ To generate a xml report for all the latest versions of all the modules in your
[source,xml]
----
-<ivy:repreport />
+<ivy:repreport/>
----
'''
@@ -65,7 +65,7 @@ To generate a graphml report for all the latest versions of all the modules in y
[source,xml]
----
-<ivy:repreport xml="false" graph="true" />
+<ivy:repreport xml="false" graph="true"/>
----
'''
@@ -74,7 +74,7 @@ To generate a xml report for all the latest versions of the modules from the org
[source,xml]
----
-<ivy:repreport organisation="foo" />
+<ivy:repreport organisation="foo"/>
----
'''
@@ -83,7 +83,7 @@ To generate a xml report for all the versions on the 1.x stream of the modules n
[source,xml]
----
-<ivy:repreport organisation="foo" module="bar*" revision="1.+" matcher="glob" />
+<ivy:repreport organisation="foo" module="bar*" revision="1.+" matcher="glob"/>
----
'''
@@ -92,7 +92,7 @@ To generate an XML report using a custom stylesheet:
[source,xml]
----
-<ivy:repreport xsl="true" xslfile="my-custom-stylesheet.xsl" xslext="xml" />
+<ivy:repreport xsl="true" xslfile="my-custom-stylesheet.xsl" xslext="xml"/>
----
'''
@@ -102,7 +102,7 @@ To generate an XML report using a custom stylesheet which needs some parameters:
[source,xml]
----
<ivy:repreport xsl="true" xslfile="my-custom-stylesheet.xsl" xslext="xml">
- <param name="param1" expression="value1" />
- <param name="param2" expression="value2" />
+ <param name="param1" expression="value1"/>
+ <param name="param2" expression="value2"/>
</report>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/resolve.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/resolve.adoc b/asciidoc/use/resolve.adoc
index 4e3d9f3..371d2c4 100644
--- a/asciidoc/use/resolve.adoc
+++ b/asciidoc/use/resolve.adoc
@@ -110,7 +110,7 @@ __Note for developers__: after the call to this task, a reference to the module
|refresh|`true` to force Ivy to resolve dynamic revision in this resolve process, `false` to use cached resolved revision *__since 2.0__*|No. defaults to `false`
|resolveMode|the resolve mode to use for this dependency resolution process *__since 2.0__*|No. defaults to using the resolve mode set in the link:../settings.html[settings]
|inline|`true` to use inline mode, false to resolve an ivy file *__since 1.4__*|No. defaults to `false`
-|keep|`true` to keep the results of the resolve in memory, false to discard them. When this is `false`, the standard ivy properties won't be set and other post-resolve tasks (like `retrieve` and `cachepath`) won't be able to resuse the results of this resolve!|No. defaults to `false` for an inline resolve and to `true` in any other case
+|keep|`true` to keep the results of the resolve in memory, false to discard them. When this is `false`, the standard ivy properties won't be set and other post-resolve tasks (like `retrieve` and `cachepath`) won't be able to reuse the results of this resolve!|No. defaults to `false` for an inline resolve and to `true` in any other case
|organisation|the organisation of the module to resolve in inline mode *__since 1.4__*|Yes in inline mode, no otherwise.
|module|the name of the module to resolve in inline mode *__since 1.4__*|Yes in inline mode, no otherwise.
|revision|the revision constraint to apply to the module to resolve in inline mode *__since 1.4__*|No. Defaults to `latest.integration` in inline mode, nothing in standard mode.
@@ -164,7 +164,7 @@ Resolve all dependencies declared in path/to/ivy.xml file.
[source,xml]
----
-<ivy:resolve file="path/to/ivy.xml" transitive="false" />
+<ivy:resolve file="path/to/ivy.xml" transitive="false"/>
----
Same as above, but with transitive dependencies disabled.
@@ -191,7 +191,7 @@ Resolve all dependencies declared in `path/to/ivy.xml` file, but download only `
[source,xml]
----
-<ivy:resolve organisation="apache" module="commons-lang" revision="2+" inline="true" />
+<ivy:resolve organisation="apache" module="commons-lang" revision="2+" inline="true"/>
----
Resolve the `commons-lang` module revision 2+ from the repository, with its dependencies.
@@ -201,9 +201,9 @@ Resolve the `commons-lang` module revision 2+ from the repository, with its depe
[source,xml]
----
<ivy:resolve>
- <dependency org="apache" name="commons-lang" rev="2+" />
- <dependency org="apache" name="commons-logging" rev="1.1" />
- <exclude org="apache" module="log4j" />
+ <dependency org="apache" name="commons-lang" rev="2+"/>
+ <dependency org="apache" name="commons-logging" rev="1.1"/>
+ <exclude org="apache" module="log4j"/>
</ivy:resolve>
----
@@ -214,7 +214,7 @@ Resolve of both `commons-lang` and `commons-logging`, with their dependencies bu
[source,xml]
----
<ivy:resolve>
- <dependency org="org.slf4j" module="slf4j" rev="1.6" conf="api,log4j" />
+ <dependency org="org.slf4j" module="slf4j" rev="1.6" conf="api,log4j"/>
</ivy:resolve>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/use/resources.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/resources.adoc b/asciidoc/use/resources.adoc
index 96fc53b..a2181e9 100644
--- a/asciidoc/use/resources.adoc
+++ b/asciidoc/use/resources.adoc
@@ -35,7 +35,7 @@ Build a resource collection of every artifacts of all dependencies declared in `
[source,xml]
----
-<ivy:resources file="path/to/ivy.xml" transitive="false" />
+<ivy:resources file="path/to/ivy.xml" transitive="false"/>
----
Same as above, but with transitive dependencies disabled.
@@ -62,7 +62,7 @@ Build a resource collection of every `jar` artifact of all dependencies declared
[source,xml]
----
-<ivy:resources organisation="apache" module="commons-lang" revision="2+" inline="true" />
+<ivy:resources organisation="apache" module="commons-lang" revision="2+" inline="true"/>
----
Build a resource collection of every artifacts of `commons-lang` module revision 2+ from the repository, with its dependencies.
@@ -72,9 +72,9 @@ Build a resource collection of every artifacts of `commons-lang` module revision
[source,xml]
----
<ivy:resources>
- <dependency org="apache" module="commons-lang" rev="2+" />
- <dependency org="apache" module="commons-logging" rev="1.1" />
- <exclude org="apache" module="log4j" />
+ <dependency org="apache" module="commons-lang" rev="2+"/>
+ <dependency org="apache" module="commons-logging" rev="1.1"/>
+ <exclude org="apache" module="log4j"/>
</ivy:resources>
----
@@ -85,7 +85,7 @@ Build a resource collection of every artifacts of both `commons-lang` and `commo
[source,xml]
----
<ivy:resources>
- <dependency org="org.slf4j" module="slf4j" rev="1.6" conf="api,log4j" />
+ <dependency org="org.slf4j" module="slf4j" rev="1.6" conf="api,log4j"/>
</ivy:resources>
----
[5/6] ant-ivy git commit: Check spelling; fix whitespace and links;
sort entries in .gitignore
Posted by hi...@apache.org.
Check spelling; fix whitespace and links; sort entries in .gitignore
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/b02336b7
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/b02336b7
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/b02336b7
Branch: refs/heads/master
Commit: b02336b76a5782e1252549b622a4593e145dfc6d
Parents: 7e764a3
Author: twogee <g....@gmail.com>
Authored: Thu Jun 29 10:46:12 2017 +0200
Committer: twogee <g....@gmail.com>
Committed: Sun Jul 2 08:05:37 2017 +0200
----------------------------------------------------------------------
.gitignore | 19 +-
asciidoc/ant.adoc | 40 +--
asciidoc/bestpractices.adoc | 18 +-
asciidoc/compatibility.adoc | 3 +-
asciidoc/concept.adoc | 54 ++--
asciidoc/configuration/caches/cache.adoc | 2 +-
asciidoc/configuration/caches/ttl.adoc | 2 +-
asciidoc/configuration/macrodef/attribute.adoc | 2 +-
asciidoc/configuration/namespace/dest.adoc | 2 +-
asciidoc/dev.adoc | 6 +-
asciidoc/dev/makerelease.adoc | 16 +-
asciidoc/index.adoc | 21 +-
asciidoc/install.adoc | 18 +-
asciidoc/ivyfile.adoc | 8 +-
asciidoc/ivyfile/artifact-conf.adoc | 2 +-
asciidoc/ivyfile/artifact-exclude.adoc | 4 +-
asciidoc/ivyfile/artifact.adoc | 10 +-
asciidoc/ivyfile/conf.adoc | 15 +-
asciidoc/ivyfile/configurations.adoc | 10 +-
asciidoc/ivyfile/conflict.adoc | 2 +-
asciidoc/ivyfile/conflicts.adoc | 8 +-
asciidoc/ivyfile/dependencies.adoc | 2 +-
asciidoc/ivyfile/dependency-artifact.adoc | 4 +-
asciidoc/ivyfile/dependency-conf.adoc | 2 +-
asciidoc/ivyfile/dependency-include.adoc | 2 +-
asciidoc/ivyfile/dependency.adoc | 16 +-
asciidoc/ivyfile/exclude.adoc | 3 +-
asciidoc/ivyfile/include.adoc | 3 +-
asciidoc/ivyfile/info.adoc | 1 -
asciidoc/ivyfile/ivyauthor.adoc | 2 +-
asciidoc/ivyfile/manager.adoc | 6 +-
asciidoc/ivyfile/mapped.adoc | 2 +-
asciidoc/ivyfile/override.adoc | 4 +-
asciidoc/moreexamples.adoc | 2 -
asciidoc/osgi.adoc | 13 +-
asciidoc/osgi/eclipse-plugin.adoc | 10 +-
asciidoc/osgi/osgi-mapping.adoc | 72 ++---
asciidoc/osgi/sigil.adoc | 1 -
asciidoc/osgi/standard-osgi.adoc | 6 +-
asciidoc/osgi/target-platform.adoc | 12 +-
asciidoc/principle.adoc | 9 +-
asciidoc/release-notes.adoc | 18 +-
asciidoc/resolver/bintray.adoc | 6 +-
asciidoc/resolver/chain.adoc | 1 -
asciidoc/resolver/dual.adoc | 2 -
asciidoc/resolver/filesystem.adoc | 4 +-
asciidoc/resolver/ibiblio.adoc | 3 +-
asciidoc/resolver/jar.adoc | 15 +-
asciidoc/resolver/mirrored.adoc | 9 +-
asciidoc/resolver/obr.adoc | 7 +-
asciidoc/resolver/osgiagg.adoc | 11 +-
asciidoc/resolver/packager.adoc | 17 +-
asciidoc/resolver/sftp.adoc | 7 +-
asciidoc/resolver/ssh.adoc | 4 +-
asciidoc/resolver/updatesite.adoc | 4 +-
asciidoc/resolver/url.adoc | 6 +-
asciidoc/resolver/vfs.adoc | 7 +-
asciidoc/running.adoc | 2 +-
asciidoc/samples/apache-hello-ivy-default.html | 14 +-
asciidoc/samples/build-install.xml | 22 +-
asciidoc/samples/build.xml | 104 +++---
asciidoc/samples/eclipse-plugin/build.xml | 38 +--
asciidoc/samples/eclipse-plugin/ivy.xml | 20 +-
.../eclipse-plugin/ivysettings.properties | 4 +-
asciidoc/samples/eclipse-plugin/ivysettings.xml | 10 +-
asciidoc/samples/ivy-doc.xsl | 36 +--
asciidoc/samples/ivy-report.css | 39 ++-
asciidoc/samples/ivy-sample-xslt.xml | 16 +-
asciidoc/samples/ivy-sample.xml | 18 +-
asciidoc/samples/ivy-style.css | 12 +-
asciidoc/samples/ivysettings-default.xml | 2 +-
.../jayasoft-ivyrep-example-default.html | 14 +-
asciidoc/samples/standard-osgi/build.xml | 44 +--
asciidoc/samples/standard-osgi/ivy.xml | 8 +-
asciidoc/samples/standard-osgi/ivysettings.xml | 8 +-
.../org.apache.ivy.sample.standard-osgi.bnd | 36 +--
asciidoc/samples/target-platform/build.xml | 34 +-
asciidoc/samples/target-platform/ivy.xml | 8 +-
.../samples/target-platform/ivysettings.xml | 8 +-
asciidoc/settings.adoc | 14 +-
asciidoc/settings/caches.adoc | 6 +-
asciidoc/settings/caches/cache.adoc | 15 +-
asciidoc/settings/caches/ttl.adoc | 6 +-
asciidoc/settings/conflict-managers.adoc | 1 -
asciidoc/settings/credentials.adoc | 1 -
asciidoc/settings/include.adoc | 2 +-
asciidoc/settings/latest-strategies.adoc | 5 +-
asciidoc/settings/lock-strategies.adoc | 2 +-
asciidoc/settings/macrodef.adoc | 31 +-
asciidoc/settings/macrodef/attribute.adoc | 3 -
asciidoc/settings/module.adoc | 7 +-
asciidoc/settings/modules.adoc | 2 -
asciidoc/settings/namespace.adoc | 3 -
asciidoc/settings/namespace/dest.adoc | 1 -
asciidoc/settings/namespace/fromtosystem.adoc | 2 -
asciidoc/settings/namespace/rule.adoc | 1 -
asciidoc/settings/namespace/src.adoc | 2 -
asciidoc/settings/namespaces.adoc | 2 -
asciidoc/settings/outputters.adoc | 3 +-
asciidoc/settings/parsers.adoc | 2 -
asciidoc/settings/properties.adoc | 5 +-
asciidoc/settings/property.adoc | 6 +-
asciidoc/settings/resolvers.adoc | 9 +-
asciidoc/settings/settings.adoc | 3 +-
asciidoc/settings/signers.adoc | 4 +-
asciidoc/settings/status.adoc | 1 -
asciidoc/settings/statuses.adoc | 6 +-
asciidoc/settings/triggers.adoc | 306 +++++++++---------
asciidoc/settings/typedef.adoc | 2 -
asciidoc/settings/version-matchers.adoc | 14 +-
asciidoc/standalone.adoc | 11 +-
asciidoc/style/style.css | 320 ++++++++-----------
asciidoc/terminology.adoc | 8 +-
asciidoc/textual.adoc | 3 +-
asciidoc/tutorial.adoc | 15 +-
asciidoc/tutorial/build-repository.adoc | 4 +-
.../tutorial/build-repository/advanced.adoc | 20 +-
asciidoc/tutorial/build-repository/basic.adoc | 20 +-
asciidoc/tutorial/conf.adoc | 24 +-
asciidoc/tutorial/defaultconf.adoc | 30 +-
asciidoc/tutorial/dependence.adoc | 62 ++--
asciidoc/tutorial/dual.adoc | 14 +-
asciidoc/tutorial/multiple.adoc | 18 +-
asciidoc/tutorial/multiproject.adoc | 48 ++-
asciidoc/tutorial/start.adoc | 20 +-
asciidoc/use/artifactproperty.adoc | 2 +-
asciidoc/use/artifactreport.adoc | 4 +-
asciidoc/use/buildlist.adoc | 10 +-
asciidoc/use/buildnumber.adoc | 10 +-
asciidoc/use/buildobr.adoc | 20 +-
asciidoc/use/cachefileset.adoc | 2 +-
asciidoc/use/cachepath.adoc | 6 +-
asciidoc/use/checkdepsupdate.adoc | 4 +-
asciidoc/use/cleancache.adoc | 6 +-
asciidoc/use/configure.adoc | 16 +-
asciidoc/use/convertmanifest.adoc | 2 +-
asciidoc/use/convertpom.adoc | 2 +-
asciidoc/use/deliver.adoc | 12 +-
asciidoc/use/dependencytree.adoc | 2 +-
asciidoc/use/fixdeps.adoc | 8 +-
asciidoc/use/info.adoc | 8 +-
asciidoc/use/makepom.adoc | 6 +-
asciidoc/use/postresolvetask.adoc | 4 +-
asciidoc/use/publish.adoc | 4 +-
asciidoc/use/report.adoc | 10 +-
asciidoc/use/repreport.adoc | 14 +-
asciidoc/use/resolve.adoc | 14 +-
asciidoc/use/resources.adoc | 12 +-
asciidoc/use/retrieve.adoc | 10 +-
asciidoc/use/settings.adoc | 24 +-
asciidoc/use/var.adoc | 2 +-
asciidoc/yed.adoc | 4 +-
build-release.xml | 31 +-
build.xml | 116 ++++---
154 files changed, 1200 insertions(+), 1301 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 40f8e72..5645641 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,21 @@
.classpath
+.DS_Store
.idea
*.iml
.ivy2
+*~
+asciidoc/tutorial/log
bin
build
doc/style/.svn
doc/xooki/.svn
+doc/samples/target-platform/bundles
+doc/samples/target-platform/cache
lib
test/jar-repos
+test/repositories/checkmodified/ivy-1.0.xml
+test/repositories/checkmodified/mod1.1-1.0.jar
+test/repositories/norevision/ivy-mod1.1.xml
+test/repositories/norevision/mod1.1.jar
test/test-repo/bundlerepo/*.jar
test/test-repo/ivyrepo/org.apache.ivy.osgi
-.DS_Store
-doc/samples/target-platform/bundles
-doc/samples/target-platform/cache
-*~
-/test/repositories/checkmodified/ivy-1.0.xml
-/test/repositories/checkmodified/mod1.1-1.0.jar
-/test/repositories/norevision/ivy-mod1.1.xml
-/test/repositories/norevision/mod1.1.jar
-asciidoc/tutorial/log
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ant.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ant.adoc b/asciidoc/ant.adoc
index 836ecc0..bbb3291 100644
--- a/asciidoc/ant.adoc
+++ b/asciidoc/ant.adoc
@@ -41,7 +41,7 @@ If you use ant *1.5.1* or superior, you have to define the tasks you use in your
<taskdef name="ivy-configure" classname="org.apache.ivy.ant.IvyConfigure"/>
<taskdef name="ivy-resolve" classname="org.apache.ivy.ant.IvyResolve"/>
<taskdef name="ivy-retrieve" classname="org.apache.ivy.ant.IvyRetrieve"/>
- <taskdef name="ivy-deliver" classname="org.apache.ivy.ant.IvyDeliver"/>
+ <taskdef name="ivy-deliver" classname="org.apache.ivy.ant.IvyDeliver"/>
<taskdef name="ivy-publish" classname="org.apache.ivy.ant.IvyPublish"/>
----
@@ -57,7 +57,7 @@ Once your build file is ok to call ivy tasks, the simplest way to use ivy is to
[source,xml]
----
-<ivy:retrieve />
+<ivy:retrieve/>
----
This calls ivy with default values, which might be ok in several projects. In fact, it is equivalent to:
@@ -65,11 +65,11 @@ This calls ivy with default values, which might be ok in several projects. In fa
[source,xml]
----
<target name="resolve">
- <ivy:configure />
-
- <ivy:resolve file="${ivy.dep.file}" conf="${ivy.configurations}" />
-
- <ivy:retrieve pattern="${ivy.retrieve.pattern}" conf="${ivy.configurations}" />
+ <ivy:configure/>
+
+ <ivy:resolve file="${ivy.dep.file}" conf="${ivy.configurations}"/>
+
+ <ivy:retrieve pattern="${ivy.retrieve.pattern}" conf="${ivy.configurations}"/>
</target>
----
@@ -87,7 +87,7 @@ ivy.project.dir = ${basedir}
ivy.lib.dir = ${ivy.project.dir}/lib
ivy.build.artifacts.dir = ${ivy.project.dir}/build/artifacts
ivy.distrib.dir = ${ivy.project.dir}/distrib
-
+
ivy.resolver.default.check.modified = false
ivy.default.always.check.exact.revision = true
@@ -139,33 +139,33 @@ Here is a more complete example of build file using Ivy:
<project xmlns:ivy="antlib:org.apache.ivy.ant" name="sample" default="resolve">
<target name="resolve">
- <ivy:configure file="../ivysettings.xml" />
-
- <ivy:resolve file="my-ivy.xml" conf="default, myconf" />
-
+ <ivy:configure file="../ivysettings.xml"/>
+
+ <ivy:resolve file="my-ivy.xml" conf="default, myconf"/>
+
</target>
-
+
<target name="retrieve-default" depends="resolve">
- <ivy:retrieve pattern="lib/default/[artifact]-[revision].[ext]" conf="default" />
+ <ivy:retrieve pattern="lib/default/[artifact]-[revision].[ext]" conf="default"/>
</target>
<target name="retrieve-myconf" depends="resolve">
- <ivy:retrieve pattern="lib/myconf/[artifact]-[revision].[ext]" conf="myconf" />
+ <ivy:retrieve pattern="lib/myconf/[artifact]-[revision].[ext]" conf="myconf"/>
</target>
<target name="retrieve-all" depends="resolve">
- <ivy:retrieve pattern="lib/[conf]/[artifact]-[revision].[ext]" conf="*" />
+ <ivy:retrieve pattern="lib/[conf]/[artifact]-[revision].[ext]" conf="*"/>
</target>
<target name="deliver" depends="retrieve-all">
<ivy:deliver deliverpattern="distrib/[artifact]-[revision].[ext]"
- pubrevision="1.1b4" pubdate="20050115123254" status="milestone" />
+ pubrevision="1.1b4" pubdate="20050115123254" status="milestone"/>
</target>
<target name="publish" depends="deliver">
- <ivy:publish resolver="internal"
- artifactspattern="distrib/[artifact]-[revision].[ext]"
- pubrevision="1.1b4" />
+ <ivy:publish resolver="internal"
+ artifactspattern="distrib/[artifact]-[revision].[ext]"
+ pubrevision="1.1b4"/>
</target>
</project>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/bestpractices.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/bestpractices.adoc b/asciidoc/bestpractices.adoc
index 9158483..6d7c9fc 100644
--- a/asciidoc/bestpractices.adoc
+++ b/asciidoc/bestpractices.adoc
@@ -37,7 +37,7 @@ This is usually not a valid recommendation for open source projects, but for the
* control +
- The main problem with these kinds of public repositories is that you don't have control over the repository. This means that if a module descriptor is broken you cannot easily fix it. Sure you can use a chain between a shared repository and the public one and put your fixed module descriptor in the shared repository so that it hides the one on the public repository, but this makes repository browsing and maintenance cumbersome.
+ The main problem with these kinds of public repositories is that you don't have control over the repository. This means that if a module descriptor is broken you cannot easily fix it. Sure you can use a chain between a shared repository and the public one and put your fixed module descriptor in the shared repository so that it hides the one on the public repository, but this makes repository browsing and maintenance cumbersome.
Even more problematic is the possible updates of the repository. We know that versions published in such repositories should be stable and not be updated, but we also frequently see that a module descriptor is buggy, or an artifact corrupted. We even see sometimes a new version published with the same name as the preceding one because the previous one was simply badly packaged. This can occur even to the best; it occurred to us with Ivy 1.2 :-) But then we decided to publish the new version with a different name, 1.2a. But if the repository manager allows such updates, this means that what worked before can break. It can thus break your build reproducibility.
* reliability +
@@ -54,17 +54,17 @@ Note that using an enterprise repository doesn't mean you have to build it entir
== Always use patterns with at least organisation and module
-Ivy is very flexible and can accomodate a lot of existing repositories, using the concept of link:concept.html#pattern[patterns]. But if your repository doesn't exist yet, we strongly recommend always using the organisation and the module name in your pattern, even for a private repository where you put only your own modules (which all have the same organisation). Why? Because the Ivy listing feature relies on the token it can find in the pattern. If you have no organisation token in your pattern, Ivy won't be able to list the (only?) organisation in your repository. And this can be a problem for code completion in IvyDE, for example, but also for repository wide tasks like link:use/install.html[install] or link:use/repreport.html[repreport].
+Ivy is very flexible and can accommodate a lot of existing repositories, using the concept of link:concept.html#pattern[patterns]. But if your repository doesn't exist yet, we strongly recommend always using the organisation and the module name in your pattern, even for a private repository where you put only your own modules (which all have the same organisation). Why? Because the Ivy listing feature relies on the token it can find in the pattern. If you have no organisation token in your pattern, Ivy won't be able to list the (only?) organisation in your repository. And this can be a problem for code completion in IvyDE, for example, but also for repository wide tasks like link:use/install.html[install] or link:use/repreport.html[repreport].
== Public ivysettings.xml with public repositories
-If you create a public repository, provide a URL to the link:settings.html[ivysettings.xml] file. It's pretty easy to do, and if someone wants to leverage your repository, he will just have to load it with link:use/settings.html[settings] with the URL of your ivysettings.xml file, or link:configuration/include.html[include] it in its own configuration file, which makes it really easy to combine several public repositories.
+If you create a public repository, provide a URL to the link:settings.html[ivysettings.xml] file. It's pretty easy to do, and if someone wants to leverage your repository, he will just have to load it with link:use/settings.html[settings] with the URL of your ivysettings.xml file, or link:settings/include.html[include] it in its own configuration file, which makes it really easy to combine several public repositories.
== Dealing with integration versions
-Very often, especially when working in a team or with several modules, you will need to rely on intermediate, non-finalized versions of your modules. These versions are what we call integration versions, because their main objective is to be integrated with other modules to make and test an application or a framework.
+Very often, especially when working in a team or with several modules, you will need to rely on intermediate, non-finalized versions of your modules. These versions are what we call integration versions, because their main objective is to be integrated with other modules to make and test an application or a framework.
If you follow the continuous integration paradigm across modules, these integration versions can be produced by a continuous integration server, very frequently.
@@ -74,7 +74,7 @@ There are basically two ways to deal with them, both ways being supported by Ivy
* use a naming convention like a special suffix +
- the idea is pretty simple, each time you publish a new integration of your module you give the same name to the version (in maven world this is for example 1.0-SNAPSHOT). The dependency manager should then be aware that this version is special because it changes over time, so that it does not trust its local cache if it already has the version, but checks the date of the version on the repository and sees if it has changed. In Ivy this is supported using the link:ivyfile/dependency.html[changing attribute] on a dependency or by configuring the link:configuration/resolvers.html[changing pattern] to use for all your modules.
+ the idea is pretty simple, each time you publish a new integration of your module you give the same name to the version (in maven world this is for example 1.0-SNAPSHOT). The dependency manager should then be aware that this version is special because it changes over time, so that it does not trust its local cache if it already has the version, but checks the date of the version on the repository and sees if it has changed. In Ivy this is supported using the link:ivyfile/dependency.html[changing attribute] on a dependency or by configuring the link:settings/resolvers.html[changing pattern] to use for all your modules.
* automatically create a new version for each +
in this case you use either a build number or a timestamp to publish each new integration version with a new version name. Then you can use one of the numerous ways in Ivy to link:ivyfile/dependency.html[express a version constraint]. Usually selecting the very latest one (using 'latest.integration' as version constraint) is enough.
@@ -82,7 +82,7 @@ There are basically two ways to deal with them, both ways being supported by Ivy
So, which way is the best? As often, it depends on your context, and if one of the two was really bad it wouldn't be supported in Ivy :-)
-But usually we recommend using the second one, because using a new version each time you publish a new version better fits the version identity paradigm, and can make *all* your builds reproducible, even integration ones. And this is interesting because it enables, with some work in your build system, the ability to introduce a mechanism to promote an integration build to a more stable status, like a milestone or a release.
+But usually we recommend using the second one, because using a new version each time you publish a new version better fits the version identity paradigm, and can make *all* your builds reproducible, even integration ones. And this is interesting because it enables, with some work in your build system, the ability to introduce a mechanism to promote an integration build to a more stable status, like a milestone or a release.
Imagine you have a customer who comes on a Monday morning and asks for the latest version of your software, for testing or demonstration purposes. Obviously he needs it for the afternoon :-) Now if you have a continuous integration process and good tracking of your changes and your artifacts, it may occur to you that you are actually able to fulfill his request without needing the use of a DeLorean to give you some more time :-) But it may also occur to you that your latest version is stable enough to be used for the purpose of the customer, but was actually built a few days ago, because the very latest just broke a feature or introduced a new one you don't want to deliver. You can deliver this 'stable' integration build if you want, but rest assured that a few days, or weeks, or even months later, the customer will ask for a bug fix on this demo only version. Why? Because it's a customer, and we all know how they are :-)
@@ -95,7 +95,7 @@ On the other hand, the main drawback of this solution is that it can produce a l
== Inlining dependencies or not?
-With Ivy 1.4 you can resolve a dependency without even writing an ivy file. This pratice is called inlining. But what is it good for, and when should it be avoided?
+With Ivy 1.4 you can resolve a dependency without even writing an ivy file. This practice is called inlining. But what is it good for, and when should it be avoided?
Putting ivy dependencies in a separate file has the following advantages:
@@ -116,12 +116,12 @@ On the other hand, using inline dependencies is very useful when:
Without ivy you usually either copy the custom task jar in ant lib, which requires maintenance of your workstation installation, or use a manual copy or download and a taskdef with the appropriate classpath, which is better. But if you have several custom tasks, or if they have themselves dependencies, it can become cumbersome. Using Ivy with an inline dependency is an elegant way to solve this problem.
* you want to easily deploy an application +
- If you already build your application and its modules using Ivy, it is really easy to leverage your ivy repository to download your application and all its dependencies on the local filesystem, ready to be executed. If you also put your configuration files as artifacts in your repository (maybee packaged as a zip), the whole installation process can rely on ivy, easing the automatic installation of *any* version of your application available in your repository!
+ If you already build your application and its modules using Ivy, it is really easy to leverage your ivy repository to download your application and all its dependencies on the local filesystem, ready to be executed. If you also put your configuration files as artifacts in your repository (maybe packaged as a zip), the whole installation process can rely on ivy, easing the automatic installation of *any* version of your application available in your repository!
== Hire an expert
-Build and dependency management is often given too low a priority in the software development world. We often see build management implemented by developers when they have time. Even if this may seem like a time and money savings in the short term, it often turns out to be a very bad choice in the long term. Building software is not a simple task, when you want to ensure automatic, tested, fully reproducible builds, releases and installations. On the other hand, once a good build system fitting your very specific needs is setup, it can then only rely on a few people with a good understanding of what is going on, with a constant quality ensured.
+Build and dependency management is often given too low a priority in the software development world. We often see build management implemented by developers when they have time. Even if this may seem like a time and money savings in the short term, it often turns out to be a very bad choice in the long term. Building software is not a simple task, when you want to ensure automatic, tested, fully reproducible builds, releases and installations. On the other hand, once a good build system fitting your very specific needs is setup, it can then only rely on a few people with a good understanding of what is going on, with a constant quality ensured.
Therefore hiring a build and dependency expert to analyse and improve your build and release system is most of the time a very good choice.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/compatibility.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/compatibility.adoc b/asciidoc/compatibility.adoc
index 0ba6891..131fbfd 100644
--- a/asciidoc/compatibility.adoc
+++ b/asciidoc/compatibility.adoc
@@ -17,7 +17,7 @@
under the License.
////
-== JVM compability
+== JVM compatibility
Up to Ivy 2.3.x, a minimum of Java 1.4 is required.
@@ -43,4 +43,3 @@ The required versions of the Apache HttpClient, Jsch or any optional dependency
Ivy does not at this time support multithreaded use. It thus should not be used with the ant `<parallel>` task.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/concept.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/concept.adoc b/asciidoc/concept.adoc
index ee92657..c9a717b 100644
--- a/asciidoc/concept.adoc
+++ b/asciidoc/concept.adoc
@@ -54,10 +54,10 @@ For details on how to declare your module configurations, how to declare in whic
During configuration, ivy allows you to define what are called ivy variables. Ivy variables can be seen as ant properties, and are used in a very similar way. In particular, you use a properties tag in the configuration file to load a properties file containing ivy variables and their values.
-But the main differences between ant properties and ivy variables are that ivy variables can be overridden, whereas ant
+But the main differences between ant properties and ivy variables are that ivy variables can be overridden, whereas ant
properties can't, and that they are defined in separate environments.
-Actually all ant properties are imported into ivy variables when the configuration is done (if you call ivy from ant).
+Actually all ant properties are imported into ivy variables when the configuration is done (if you call ivy from ant).
This means that if you define an ant property after the call to configure, it will not be available as an ivy variable.
On the other hand, ivy variables are NOT exported to ant, thus if you define ivy variables in ivy, do not try to use them as ant properties.
@@ -69,7 +69,7 @@ Finally, it's also important to be aware of the time of substitution of variable
Moreover, in an ant environment, a bunch of variables are going to be set by default via the ant property file loading mechanism (actually they are first loaded as ant properties and then imported as ivy variables, see link:ant.html[Ant Tasks]), and even in the ant properties themselves there is going to be eager substitution on loading, effectively making it impossible to override some variable purely via the ivysettings.properties file. Some variables will really only be able to be overridden via ant properties because of this.
-Moreover, it's also important to understand the difference between ivy variables and ivy pattern tokens.
+Moreover, it's also important to understand the difference between ivy variables and ivy pattern tokens.
See the Patterns chapter below for what pattern tokens are.
== [[patterns]]Patterns
@@ -81,9 +81,9 @@ First let's give an example. You can for instance configure the file system depe
a pattern to find artifacts. This pattern can be like this:
myrepository/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]
-This pattern indicates that the repository we use is in a directory called myrepository.
+This pattern indicates that the repository we use is in a directory called myrepository.
-In this directory we have directories having for name the name of the organisation of the module we look for.
+In this directory we have directories having for name the name of the organisation of the module we look for.
Then we have a directory per module, each having for name the name of the module.
Then in module directories we find a directory per artifact type (jars, wars, ivys, ...), in which we find artifacts named by the artifact id, followed by a hyphen, then the revision, a dot, and the artifact extension.
Not too difficult to understand is it? That's it, you have understood the pattern concept!
@@ -103,7 +103,7 @@ But here are all the tokens currently available:
the organisation name
* [orgPath] *__(since 2.3)__* +
- the organisation name where '.' has been replaced by '/'. This can be used to configure maven2-like repositories.
+ the organisation name where '.' has been replaced by '/'. This can be used to configure maven2-like repositories.
* [module] +
the module name
@@ -140,10 +140,10 @@ So if you surround a token with '(' and ')', any other text which is between the
For instance, suppose the pattern: "abc(def[type]ghi)"
type = "jar" -> the substituted pattern: abcdefjarghi
-type = null or "" -> the substitued pattern: abc
+type = null or "" -> the substituted pattern: abc
A more real life example:
-The pattern
+The pattern
[source]
----
[artifact](-[revision]).[ext]
@@ -216,7 +216,7 @@ Note also that with any matcher, the character '*' has the special meaning of ma
== [[extra]]Extra attributes
*__since 1.4__*
-Several tags in ivy xml files are extensible with what is called extra attributes.
+Several tags in ivy xml files are extensible with what is called extra attributes.
The idea is very simple: if you need some more information to define your modules, you can add the attribute you want and you will then be able to access it as any other attribute in your patterns.
*__since 2.0__*
@@ -239,13 +239,13 @@ Here is an ivy file with the attribute 'color' set to blue:
----
-Then you must use the extra attribute when you declare a dependency on foo. Those extra attributes
+Then you must use the extra attribute when you declare a dependency on foo. Those extra attributes
will indeed be used as identifiers for the module like the org the name and the revision:
[source]
----
-<dependency org="apache" name="foo" e:color="blue" rev="1.5+" />
+<dependency org="apache" name="foo" e:color="blue" rev="1.5+"/>
----
@@ -260,7 +260,7 @@ ${repository.dir}/[organisation]/[module]/[color]/[revision]/[artifact].[ext]
Note that in patterns you must use the unqualified attribute name (no namespace prefix).
-If you don't want to use xml namespaces, it's possible but you will need to disable ivy file validation, since your files won't fulffill anymore the official ivy xsd. See the link:settings/settings.html[settings documentation] to see how to disable validation.
+If you don't want to use xml namespaces, it's possible but you will need to disable ivy file validation, since your files won't fulfill anymore the official ivy xsd. See the link:settings/settings.html[settings documentation] to see how to disable validation.
== [[checksum]]Checksums
@@ -283,12 +283,12 @@ If you want to change this default, you can set the variable ivy.checksums. Henc
=== Supported algorithms
*__since 1.4__*
-
-
+
+
* md5 +
-
+
* sha1 +
-
+
*__since 2.5__*
Starting 2.5 version, in addition to md5 and sha1, Ivy supports SHA-256, SHA-512 and SHA-384 algorithms, if the Java runtime in which Ivy is running, supports those. For example, Java 6 runtime supports SHA-256 and SHA-512 as standard algorithms. If Ivy 2.5 and later versions are run under Java 6 or higher runtimes, these algorithms are supported by Ivy too.
@@ -298,7 +298,7 @@ Starting 2.5 version, in addition to md5 and sha1, Ivy supports SHA-256, SHA-512
*__since 1.4__*
When Ivy performs the dependency resolution and some other tasks, it fires events before and after the most important steps. You can listen to these events using Ivy API, or you can even register a trigger to perform a particular action when a particular event occur.
-This is a particularly powerful and flexible feature which allows, for example, you to perform a build of a dependency just before it is resolved, or follow what's happening during the dependency resolution process accuratly, and so on.
+This is a particularly powerful and flexible feature which allows, for example, you to perform a build of a dependency just before it is resolved, or follow what's happening during the dependency resolution process accurately, and so on.
For more details about events and triggers, see the link:settings/triggers.html[triggers] documentation page in the configuration section of this documentation.
@@ -328,7 +328,7 @@ See the link:settings/settings.html[configuration page] to see how to configure
== Cache and Change Management
-Ivy heavily relies on local caching to avoid accessing remote repositories too often, thus saving a lot of network bandwidth and time.
+Ivy heavily relies on local caching to avoid accessing remote repositories too often, thus saving a lot of network bandwidth and time.
=== [[cache]]Cache types
@@ -338,7 +338,7 @@ An Ivy cache is composed of two different parts:
* the repository cache +
The repository cache is where Ivy stores data downloaded from module repositories, along with some meta information concerning these artifacts, like their original location.
-This part of the cache can be shared if you use a well suited link:settings/lock-strategies.html[lock strategy].
+This part of the cache can be shared if you use a well suited link:settings/lock-strategies.html[lock strategy].
* the resolution cache +
This part of the cache is used to store resolution data, which is used by Ivy to reuse the results of a resolve process.
@@ -350,7 +350,7 @@ While there is always only one resolution cache, you can link:settings/caches.ht
=== [[change]]Change management
-To optimize the dependency resolution and the way the cache is used, Ivy assumes by default that a revision never changes. So once Ivy has a module in its cache (metadata and artifacts), it trusts the cache and does not even query the repository. This optimization is very useful in most cases, and causes no problem as long as you respect this paradigm: a revision never changes. Besides performance, there are several link:bestpractices.html[good reasons] to follow this principle.
+To optimize the dependency resolution and the way the cache is used, Ivy assumes by default that a revision never changes. So once Ivy has a module in its cache (metadata and artifacts), it trusts the cache and does not even query the repository. This optimization is very useful in most cases, and causes no problem as long as you respect this paradigm: a revision never changes. Besides performance, there are several link:bestpractices.html[good reasons] to follow this principle.
However, depending on your current build system and your dependency management strategy, you may prefer to update your modules sometimes. There are two kinds of changes to consider:
@@ -374,7 +374,7 @@ So if you want to use changing revisions, use the link:use/publish.html[publish]
As a dependency manager, Ivy has a lot of file related operations, which most of the time use paths or path patterns to locate the file on the filesystem.
-These paths can obviously be relative or absolute. We recommend to always use absolute paths, so that you don't have to worry about what is the base of your relative paths. Ivy provides some variables which can be used as the base of your absolute paths. For instance, Ivy has a concept of base directory, which is basically the same as for Ant. You have access to this base directory with the ivy.basedir variable. So if you have a path like
+These paths can obviously be relative or absolute. We recommend to always use absolute paths, so that you don't have to worry about what is the base of your relative paths. Ivy provides some variables which can be used as the base of your absolute paths. For instance, Ivy has a concept of base directory, which is basically the same as for Ant. You have access to this base directory with the ivy.basedir variable. So if you have a path like
[source]
----
${ivy.basedir}/ivy.xml
@@ -396,15 +396,15 @@ If you really want to use relative paths, the base directory used to actually lo
== [[packaging]]Packaging
-Most of the artifacts found in a repository are jars. They can be downoaded and used as is. But some other kind of artifacts required some __unpacking__ after being downloaded and before being used. Such artifacts can be zipped folders and packed jars. Ivy supports that kind of artifact with *packaging*.
+Most of the artifacts found in a repository are jars. They can be downloaded and used as is. But some other kind of artifacts required some __unpacking__ after being downloaded and before being used. Such artifacts can be zipped folders and packed jars. Ivy supports that kind of artifact with *packaging*.
A __packaged__ artifact needs to be declared as such in the module descriptor via the attribute link:ivyfile/artifact.html[packaging]. The value of that attribute defined which kind of unpacking algorithm must be used. Here are the list of currently supported algorithms:
-
+
* `zip`, `jar` or `war`: the artifact will be uncompressed as a folder +
-
+
* `pack200`: the artifact will be unpacked to a file via the link:http://docs.oracle.com/javase/7/docs/technotes/tools/share/pack200.html[pack200] algorithm +
-
+
* `bundle`: the OSGi artifact will be uncompressed as a folder, and every embedded jar file entry which is packed via the the link:http://docs.oracle.com/javase/7/docs/technotes/tools/share/pack200.html[pack200] algorithm will be unpacked +
@@ -413,10 +413,10 @@ So, if in an `ivy.xml`, there would be declared a such artifact:
[source]
----
- <artifact name="mymodule" type="jar" ext="jar.pack.gz" packaging="pack200" />
+ <artifact name="mymodule" type="jar" ext="jar.pack.gz" packaging="pack200"/>
----
-A file `mymodule-1.2.3.jar.pack.gz` would be download into the cache, and also uncompressed in the cache to `mymodule-1.2.3.jar`. Then any post resolve task which supports it, like the link:use/cachepath.html[cachepath], will use the uncompressed file instead of the orginal compressed file.
+A file `mymodule-1.2.3.jar.pack.gz` would be download into the cache, and also uncompressed in the cache to `mymodule-1.2.3.jar`. Then any post resolve task which supports it, like the link:use/cachepath.html[cachepath], will use the uncompressed file instead of the original compressed file.
It is possible to chain packing algorithm. The attribute link:ivyfile/artifact.html[packaging] of a artifact expects a comma separated list of packing types, in packing order. For instance, an artifact '`mymodule-1.2.3.jar.pack.gz`' can have the packaging '`jar,pack200`', so it would be uncompressed as a folder '`mymodule-1.2.3`'.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/configuration/caches/cache.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/caches/cache.adoc b/asciidoc/configuration/caches/cache.adoc
index faadfe4..a133893 100644
--- a/asciidoc/configuration/caches/cache.adoc
+++ b/asciidoc/configuration/caches/cache.adoc
@@ -17,4 +17,4 @@
under the License.
////
This page has moved. If your browser doesn't automatically redirect to its new location, click
-link:../../settings/caches/cache.html[here].
+link:../../settings/caches/cache.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/configuration/caches/ttl.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/caches/ttl.adoc b/asciidoc/configuration/caches/ttl.adoc
index ca1de28..d50d1ae 100644
--- a/asciidoc/configuration/caches/ttl.adoc
+++ b/asciidoc/configuration/caches/ttl.adoc
@@ -18,4 +18,4 @@
////
This page has moved. If your browser doesn't automatically redirect to its new location, click
-link:../../settings/caches/ttl.html[here].
+link:../../settings/caches/ttl.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/configuration/macrodef/attribute.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/macrodef/attribute.adoc b/asciidoc/configuration/macrodef/attribute.adoc
index 27510e4..4d3c143 100644
--- a/asciidoc/configuration/macrodef/attribute.adoc
+++ b/asciidoc/configuration/macrodef/attribute.adoc
@@ -18,4 +18,4 @@
////
This page has moved. If your browser doesn't automatically redirect to its new location, click
-link:../../settings/macrodef/attribute.html[here].
+link:../../settings/macrodef/attribute.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/configuration/namespace/dest.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/configuration/namespace/dest.adoc b/asciidoc/configuration/namespace/dest.adoc
index 316431b..b938e6a 100644
--- a/asciidoc/configuration/namespace/dest.adoc
+++ b/asciidoc/configuration/namespace/dest.adoc
@@ -18,4 +18,4 @@
////
This page has moved. If your browser doesn't automatically redirect to its new location, click
-link:../../settings/namespace/dest.html[here].
+link:../../settings/namespace/dest.html[here].
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/dev.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/dev.adoc b/asciidoc/dev.adoc
index 901362b..aadf5b5 100644
--- a/asciidoc/dev.adoc
+++ b/asciidoc/dev.adoc
@@ -20,11 +20,11 @@
== Building from source
-To build Ivy from source it's really easy.
+To build Ivy from source it's really easy.
=== Requirements
-All you need is
+All you need is
* an link:http://subversion.tigris.org/[svn] client +
@@ -135,7 +135,7 @@ Download the file and unzip its content in your eclipse installation directory.
=== recommended plugins
-The Ivy project comes with settings for the link:http://eclipse-cs.sourceforge.net/[checkstyle plugin] we recommend to use to avoid introducing new disgression to the checkstyle rules we use.
+The Ivy project comes with settings for the link:http://eclipse-cs.sourceforge.net/[checkstyle plugin] we recommend to use to avoid introducing new digression to the checkstyle rules we use.
If you use this plugin, you will many errors in Ivy. As we said, following strict checkstyle rules is a work in progress and we used to have pretty different code conventions (like using _ as prefix for private attributes), so we still have things to fix. We usually use the filter in the problems view to filter out checkstyle errors from this view, which helps to know what the real compilation problem are.
Besides this plugin we also recommend to use a subversion plugin, link:http://www.eclipse.org/subversive/[subversive] or link:http://subclipse.tigris.org[subclipse] being the two options currently available in the open source landscape.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/dev/makerelease.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/dev/makerelease.adoc b/asciidoc/dev/makerelease.adoc
index 605740d..4dc4849 100644
--- a/asciidoc/dev/makerelease.adoc
+++ b/asciidoc/dev/makerelease.adoc
@@ -92,7 +92,7 @@ You can also do a smoke test with the generated ivy.jar, to see if it is able to
==== 6. Sign the artifacts
-It's now time to sign the release artifacts and upload them to a location accessible by other Apache commiters.
+It's now time to sign the release artifacts and upload them to a location accessible by other Apache committers.
Here is a simple way to sign the files using gnupg:
@@ -110,7 +110,7 @@ Here is a ruby script you can use to sign the files:
require 'find'
-Find.find('build/distrib') do |f|
+Find.find('build/distrib') do |f|
`gpg --armor --output #{f}.asc --detach-sig #{f}` if File.file?(f) && ['.zip', '.gz', '.jar', '.pom'].include?(File.extname(f))
end
@@ -154,7 +154,7 @@ ant -f build-release.xml upload-nexus
----
-Once uploaded, log in https://repository.apache.org/ with your prefered web browser (use your Apache ID).
+Once uploaded, log in https://repository.apache.org/ with your preferred web browser (use your Apache ID).
You should find there an __open__ repository with the name of the form `orgapacheant-XXXX`. It should contain the Maven artifacts: the pom, the jar, the sources, the javadocs and the md5 and asc files.
@@ -179,7 +179,7 @@ And push the changes to the ASF repo
[source]
----
-git push --tags
+git push --tags
----
@@ -229,13 +229,13 @@ $ svn mv https://dist.apache.org/repos/dist/dev/ant/ivy/$VERSION https://dist.ap
----
-In order to keep the main dist area of a reasonable size, old releases should be removed. They will disapear from the main dist but will still be available via the link:http://archive.apache.org/dist/ant/ivy/[archive]. To do so, just use the `svn rm` command against the artifacts or folders to remove.
+In order to keep the main dist area of a reasonable size, old releases should be removed. They will disappear from the main dist but will still be available via the link:http://archive.apache.org/dist/ant/ivy/[archive]. To do so, just use the `svn rm` command against the artifacts or folders to remove.
==== 13. Promote the Maven staging repository
-Go log in https://repository.apache.org/ with your prefered web browser (use your Apache ID).
+Go log in https://repository.apache.org/ with your preferred web browser (use your Apache ID).
Select the appropriate `orgapacheant-XXXX` repository and select the __Release__ action.
@@ -293,9 +293,9 @@ ant /all generate-site
----
-You should verify that the site generated in the production directory is OK. You can open the files with your prefered web browser like it was deployed.
+You should verify that the site generated in the production directory is OK. You can open the files with your preferred web browser like it was deployed.
-And once your happy with it, commit the changes in the source directory, and in the production directoy to get it actually deployed via svnpubsub.
+And once your happy with it, commit the changes in the source directory, and in the production directory to get it actually deployed via svnpubsub.
Tip: lot's of files might need to be 'added' to svn. An handy command to `add` any file which is not yet under version control is the following one:
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/index.adoc b/asciidoc/index.adoc
index e25349b..da35c0b 100644
--- a/asciidoc/index.adoc
+++ b/asciidoc/index.adoc
@@ -34,7 +34,7 @@ Ivy is open source and released under a very permissive link:https://ant.apache.
Ivy has a lot of powerful link:https://ant.apache.org/ivy/features.html[features], the most popular and useful being its flexibility, integration with ant, and its strong transitive dependencies management engine.
-The transitive dependencies management is a feature which lets you get dependencies of your dependencies, transitively. In order to address this general problem, ivy needs to find metadata about your modules, usually in an link:ivyfile.html[ivy file]. To find the metadata and your dependencies' artifacts (usually jars), Ivy can be configured to use a lot of different link:configuration/resolvers.html[repositories].
+The transitive dependencies management is a feature which lets you get dependencies of your dependencies, transitively. In order to address this general problem, ivy needs to find metadata about your modules, usually in an link:ivyfile.html[ivy file]. To find the metadata and your dependencies' artifacts (usually jars), Ivy can be configured to use a lot of different link:settings/resolvers.html[repositories].
== About this doc
@@ -62,7 +62,7 @@ For earlier versions, we suggest downloading the documentation to browse the doc
== Other places to go
-Check out Ivy link:https://ant.apache.org/ivy/features.html[features]. +
+Check out Ivy link:https://ant.apache.org/ivy/features.html[features]. +
Read our link:https://ant.apache.org/ivy/faq.html[FAQ]. +
Ask for help on our link:https://ant.apache.org/ivy/mailing-lists.html[mailing lists]. +
Report a bug or feature request in our link:https://ant.apache.org/ivy/issues.html[issue tracking system]. +
@@ -73,15 +73,14 @@ Check link:https://ant.apache.org/ivy/links.html[external tools and resources].
This documentation is composed of three main parts:
-
-* link:tutorial.html[Tutorials] +
+
+* link:tutorial.html[Tutorials] +
The tutorials is the best way to begin to play with Ivy. You will easily and quickly learn the basics of Ivy.
-
-* link:reference.html[Reference] +
-The reference documentation gives you all the details of Ivy.
-The introduction part is particularly useful: it defines some vocabulary, explains main concepts such as dependency resolvers and patterns, and gives an overview of how ivy works internally.
+
+* link:reference.html[Reference] +
+The reference documentation gives you all the details of Ivy.
+The introduction part is particularly useful: it defines some vocabulary, explains main concepts such as dependency resolvers and patterns, and gives an overview of how ivy works internally.
It's also in the reference doc that you will find all you always dreamed to know about ivy settings, ivy files, and ivy use (especially with ant).
-
-* link:dev.html[Developer doc] +
-The developers's doc is useful for users who would like to extend Ivy or build it from source. It's also the documentation used by the Ivy team, so you will also find information about how we make releases.
+* link:dev.html[Developer doc] +
+The developers's doc is useful for users who would like to extend Ivy or build it from source. It's also the documentation used by the Ivy team, so you will also find information about how we make releases.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/install.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/install.adoc b/asciidoc/install.adoc
index f55162e..54e0887 100644
--- a/asciidoc/install.adoc
+++ b/asciidoc/install.adoc
@@ -26,7 +26,7 @@ Download the version you want here, unpack the downloaded zip file wherever you
If you use ant 1.6.0 or superior, you can then simply go to the src/example/hello-ivy dir and run ant: if the build is successful, you have successfully installed Ivy!
If you use ant 1.5.1 or superior, you have to modify the build files in the examples:
-- remove the namespace section at their head: xmlns:ivy="antlib:org.apache.ivy.ant"
+- remove the namespace section at their head: xmlns:ivy="antlib:org.apache.ivy.ant"
- add taskdefs for ivy tasks:
[source]
@@ -35,7 +35,7 @@ If you use ant 1.5.1 or superior, you have to modify the build files in the exam
<taskdef name="ivy-configure" classname="org.apache.ivy.ant.IvyConfigure"/>
<taskdef name="ivy-resolve" classname="org.apache.ivy.ant.IvyResolve"/>
<taskdef name="ivy-retrieve" classname="org.apache.ivy.ant.IvyRetrieve"/>
- <taskdef name="ivy-publish" classname="org.apache.ivy.ant.IvyPublish"/>
+ <taskdef name="ivy-publish" classname="org.apache.ivy.ant.IvyPublish"/>
----
@@ -45,7 +45,7 @@ You can now run the build, if it is successful, you have successfully installed
If the build is not successful, check the FAQ to see what might be the problem with the ivyrep resolver.
-=== Ivy dependendencies
+=== Ivy dependencies
One of the two binary versions of Ivy doesn't include the optional dependencies. To download them using Ivy, all you need is to run the Ant build file provided in the distribution. This will use Ivy itself to download the dependencies. Then you should see the Ivy optional dependencies in the lib directory, organized per configuration (see the ivy.xml for details about the configurations and their use).
@@ -58,19 +58,19 @@ If you want to use Ivy only in your ant build scripts, and have an internet conn
[source]
----
- <property name="ivy.install.version" value="2.1.0-rc2" />
+ <property name="ivy.install.version" value="2.1.0-rc2"/>
<condition property="ivy.home" value="${env.IVY_HOME}">
- <isset property="env.IVY_HOME" />
+ <isset property="env.IVY_HOME"/>
</condition>
- <property name="ivy.home" value="${user.home}/.ant" />
- <property name="ivy.jar.dir" value="${ivy.home}/lib" />
- <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+ <property name="ivy.home" value="${user.home}/.ant"/>
+ <property name="ivy.jar.dir" value="${ivy.home}/lib"/>
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
<target name="download-ivy" unless="offline">
<mkdir dir="${ivy.jar.dir}"/>
<!-- download Ivy from web site so that it can be used even without any special installation -->
- <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
dest="${ivy.jar.file}" usetimestamp="true"/>
</target>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile.adoc b/asciidoc/ivyfile.adoc
index dcd38e4..9bc46ab 100644
--- a/asciidoc/ivyfile.adoc
+++ b/asciidoc/ivyfile.adoc
@@ -25,8 +25,7 @@ Here is the simplest ivy file you can write:
----
<ivy-module version="2.0">
<info organisation="myorg"
- module="mymodule"
- />
+ module="mymodule"/>
</ivy-module>
----
@@ -39,13 +38,12 @@ For those familiar with xml schema, the schema used to validate ivy files can be
[source,xml]
----
<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
+<ivy-module version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation=
"http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="myorg"
- module="mymodule"
- />
+ module="mymodule"/>
</ivy-module>
----
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/artifact-conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/artifact-conf.adoc b/asciidoc/ivyfile/artifact-conf.adoc
index 4ba0475..46cbd7a 100644
--- a/asciidoc/ivyfile/artifact-conf.adoc
+++ b/asciidoc/ivyfile/artifact-conf.adoc
@@ -26,7 +26,7 @@ Indicates a public configuration in which enclosing artifact is published.
[options="header",cols="15%,50%,35%"]
|=======
|Attribute|Description|Required
-|name|the name of the module public configuration in which this artifact is published.
+|name|the name of the module public configuration in which this artifact is published.
`$$*$$` wildcard can be used to designate all public configurations of this module|Yes
|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/artifact-exclude.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/artifact-exclude.adoc b/asciidoc/ivyfile/artifact-exclude.adoc
index d27964a..7269c6d 100644
--- a/asciidoc/ivyfile/artifact-exclude.adoc
+++ b/asciidoc/ivyfile/artifact-exclude.adoc
@@ -19,7 +19,9 @@
*Tag:* exclude *Parent:* link:../ivyfile/dependency.html[dependency]
-This feature gives you more control on a dependency for which you do not control its ivy file. It enables to restrict the artifacts required, by excluding artifacts being published by the dependency or any of its transitive dependencies, even if configuration does not a good separation of published artifacts
+This feature gives you more control on a dependency for which you do not control its ivy file.
+It enables to restrict the artifacts required, by excluding artifacts being published by the dependency or any of its transitive dependencies,
+even if configuration does not a good separation of published artifacts
The same principle concerning configuration as for include applies to this exclude feature (see the link:../ivyfile/dependency-include.html[include] feature).
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/artifact.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/artifact.adoc b/asciidoc/ivyfile/artifact.adoc
index d173453..e4ebb2e 100644
--- a/asciidoc/ivyfile/artifact.adoc
+++ b/asciidoc/ivyfile/artifact.adoc
@@ -19,7 +19,7 @@
*Tag:* artifact *Parent:* link:../ivyfile/publications.html[publications]
-Declares an artifact published by this module. This is especially useful for other modules dependending on this one. They thus get all published artifacts belonging to the configurations asked. Indeed, each published artifact declares in which public configuration it is published. Thus a module depending on this module only get artifacts marked with the asked configurations, taking into account configurations extension (see link:../ivyfile/conf.html[configuration declaration]).
+Declares an artifact published by this module. This is especially useful for other modules depending on this one. They thus get all published artifacts belonging to the configurations asked. Indeed, each published artifact declares in which public configuration it is published. Thus a module depending on this module only get artifacts marked with the asked configurations, taking into account configurations extension (see link:../ivyfile/conf.html[configuration declaration]).
The configurations in which an artifact is published can be configured in two ways:
@@ -31,7 +31,7 @@ The two are equivalent, it is only a matter of preference. However, do not mix b
*__since 1.4__* The artifact element has default values for all its attributes, so if you want to declare a default artifact you can just declare it like that:
[source,xml]
----
-<artifact />
+<artifact/>
----
If this is the only artifact declared, then it's equivalent to having no publication section at all.
@@ -69,7 +69,7 @@ If this is the only artifact declared, then it's equivalent to having no publica
[source,xml]
----
-<artifact />
+<artifact/>
----
Declares an artifact with the name of the module as name, type and ext jar, and published in all configurations.
@@ -78,7 +78,7 @@ Declares an artifact with the name of the module as name, type and ext jar, and
[source,xml]
----
-<artifact name="foo-src" type="source" ext="zip" conf="src" />
+<artifact name="foo-src" type="source" ext="zip" conf="src"/>
----
Declares an artifact `foo-src`, of type `source` with extension `zip`, and published in the `src` configuration.
@@ -87,7 +87,7 @@ Declares an artifact `foo-src`, of type `source` with extension `zip`, and publi
[source,xml]
----
-<artifact name="foo" url="http://www.acme.com/repository/barbaz/foo-1.2-bar.jar" />
+<artifact name="foo" url="http://www.acme.com/repository/barbaz/foo-1.2-bar.jar"/>
----
Declares an artifact `foo`, of type and extension `jar'` located at the url `$$http://www.acme.com/repository/barbaz/foo-1.2-bar.jar$$`. This url will only be used if the artifact cannot be found at its standard location.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/conf.adoc b/asciidoc/ivyfile/conf.adoc
index 79811e0..abe1067 100644
--- a/asciidoc/ivyfile/conf.adoc
+++ b/asciidoc/ivyfile/conf.adoc
@@ -19,7 +19,7 @@
*Tag:* conf *Parent:* link:../ivyfile/configurations.html[configurations]
-Declares a configuration of this module. As described in the reference page, a configuration is a way to use or construct a module. Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server). Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those differents ways to use or build a module are called in Ivy module configurations.
+Declares a configuration of this module. As described in the reference page, a configuration is a way to use or construct a module. Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server). Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those different ways to use or build a module are called in Ivy module configurations.
The `conf` element in the configurations section declares one configuration. This declaration gives the name of the configuration declared, its visibility and the other configurations of the module it extends.
@@ -37,7 +37,7 @@ This notion is very helpful to define configurations which are similar with some
|`*(private)`|all other private configurations
|=======
-*__since 1.4__* A whole configuration can be declared as non transitive, so that all dependencies resolved in this configuration will be resolved with transitivity disabled. Note that the transitivity is disabled for all the configuration dependencies (including those obtained because this conf extends other ones), and only for this configuration (which means that a conf extending this one with transitivityy enabled will get transitive dependencies even for dependencies being part of the non transitive configuration).
+*__since 1.4__* A whole configuration can be declared as non transitive, so that all dependencies resolved in this configuration will be resolved with transitivity disabled. Note that the transitivity is disabled for all the configuration dependencies (including those obtained because this conf extends other ones), and only for this configuration (which means that a conf extending this one with transitivity enabled will get transitive dependencies even for dependencies being part of the non transitive configuration).
This is very useful to build a compile configuration, for instance, forcing the dependency declaration on each direct dependency, with no risk to forget some because of transitivity.
*__since 1.4__* This tag supports link:../concept.html#extra[extra attributes].
@@ -52,8 +52,7 @@ This is very useful to build a compile configuration, for instance, forcing the
|visibility|the visibility of the declared configuration.
`public` means that this configuration can be used by other modules, while `private` means that this configuration is used only in the module itself, and is not exposed to other modules|No, defaults to `public`
-|extends|a comma separated list of configurations of this module that the
- current configuration extends|No, defaults to none
+|extends|a comma separated list of configurations of this module that the current configuration extends|No, defaults to none
|transitive|a boolean to indicate if this conf is transitive or not *__since 1.4__*|No, defaults to `true`
|deprecated|indicates that this conf has been deprecated by giving the date of the deprecation.
@@ -64,11 +63,11 @@ It should be given in this format: `yyyyMMddHHmmss`|No, by default the conf is n
[source,xml]
----
-<conf name="core" visibility="private" />
-<conf name="compile" extends="core" transitive="false" visibility="private" />
-<conf name="runtime" extends="compile" description="everything needed to run this module" />
+<conf name="core" visibility="private"/>
+<conf name="compile" extends="core" transitive="false" visibility="private"/>
+<conf name="runtime" extends="compile" description="everything needed to run this module"/>
----
Declares three configurations, `core`, `compile` and `runtime`, with only the `runtime` one accessible from other modules, and with the `compile` one being non transitive.
-Therefore the `core` configuration will only be composed of dependencies declared in the `core` configuration itself, the `compile` configuration will be composed of all dependencies required in either `core` or `compile` configuration, but without transivity (neither for core nor compile dependencies), and `runtime` will be composed of all dependencies, all transitively, including the dependencies declared only in `compile`.
+Therefore the `core` configuration will only be composed of dependencies declared in the `core` configuration itself, the `compile` configuration will be composed of all dependencies required in either `core` or `compile` configuration, but without transitivity (neither for core nor compile dependencies), and `runtime` will be composed of all dependencies, all transitively, including the dependencies declared only in `compile`.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/configurations.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/configurations.adoc b/asciidoc/ivyfile/configurations.adoc
index e944830..6409062 100644
--- a/asciidoc/ivyfile/configurations.adoc
+++ b/asciidoc/ivyfile/configurations.adoc
@@ -62,18 +62,18 @@ For instance, say you have:
[source,xml]
----
<configurations defaultconfmapping="conf1->other1;conf2->other2">
- <conf name="conf1" />
- <conf name="conf2" extends="conf1" />
+ <conf name="conf1"/>
+ <conf name="conf2" extends="conf1"/>
</configurations>
<dependencies>
- <dependency name="other-module" conf="conf1" />
+ <dependency name="other-module" conf="conf1"/>
</dependencies>
----
When Ivy parses this file, it will construct the following dependency (in-memory only):
[source,xml]
----
-<dependency name="other-module" conf="conf1->other1" />
+<dependency name="other-module" conf="conf1->other1"/>
----
So, if you now resolve the `conf2` configuration, you will only get the other1 dependencies of your other-module.
@@ -82,7 +82,7 @@ But when you set `confmappingoverride` to `true`, Ivy will construct the followi
[source,xml]
----
-<dependency name="other-module" conf="conf1->other1;conf2->other2" />
+<dependency name="other-module" conf="conf1->other1;conf2->other2"/>
----
As you can see, the `defaultmappings` of the extending configurations are also added (although you didn't explicitly defined them)
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/conflict.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/conflict.adoc b/asciidoc/ivyfile/conflict.adoc
index 2cddacc..f2dd7a1 100644
--- a/asciidoc/ivyfile/conflict.adoc
+++ b/asciidoc/ivyfile/conflict.adoc
@@ -32,7 +32,7 @@ There are two things optimized during conflict resolution: download of artifacts
That's why the order of dependencies is important for download optimization. Indeed ivy traverses the dependency graph in the order in which dependencies are declared in the ivy files, and each time it encounters a dependency on a module, it first check if there is a conflict on this module, and if this is the case, it asks the conflict manager to resolve the conflict. Then if the module is evicted, it does not download its ivy file, and the whole branch is not traversed, which can saves a lot of time.
If no specific conflict manager is defined, a default conflict manager is used for all modules.
-
+
The current default conflict manager is the `latest-revision` conflict manager.
== Attributes
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/conflicts.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/conflicts.adoc b/asciidoc/ivyfile/conflicts.adoc
index c517bfb..d0622fd 100644
--- a/asciidoc/ivyfile/conflicts.adoc
+++ b/asciidoc/ivyfile/conflicts.adoc
@@ -22,7 +22,7 @@
*__(since 2.0)__* the conflicts section is deprecated. Use the link:../ivyfile/conflict.html[conflict] instead.
Container for conflict manager elements, used to indicate how conflicts should be resolved
-for this module.
+for this module.
The list of built-in conflict managers available is listed on the link:../settings/conflict-managers.html[conflict manager configuration page].
@@ -37,13 +37,13 @@ ivy needs to know the dependency graph, and to know the dependency graph, it has
ivy files. But ivy is highly optimized on this too, and it tries to evict modules as soon as possible.
That's why the order of dependencies is important for download optimization. Indeed ivy
-traverses the dependency graph in the order in which dependencies are declared in the ivy files,
-and each time it encounters a dependency on a module, it first check if there is a conflict on this module,
+traverses the dependency graph in the order in which dependencies are declared in the ivy files,
+and each time it encounters a dependency on a module, it first check if there is a conflict on this module,
and if this is the case, it asks the conflict manager to resolve the conflict. Then if the module is evicted,
it does not download its ivy file, and the whole branch is not traversed, which can saves
a lot of time.
-If this container is not present, a default conflict manager is used for all modules.
+If this container is not present, a default conflict manager is used for all modules.
The current default conflict manager is the `latest-revision` conflict manager.
== Child elements
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/dependencies.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependencies.adoc b/asciidoc/ivyfile/dependencies.adoc
index fe05aa8..7085ac9 100644
--- a/asciidoc/ivyfile/dependencies.adoc
+++ b/asciidoc/ivyfile/dependencies.adoc
@@ -19,7 +19,7 @@
*Tag:* dependencies *Parent:* link:../ivyfile.html[ivy-module]
-Container for dependency elements, used to describe the dependencies of this module.
+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.
This container provides for two similar behaviors. An overview is given here. (See link:../ivyfile/configurations.html[configurations doc page] for more details about these behaviors).
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/dependency-artifact.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependency-artifact.adoc b/asciidoc/ivyfile/dependency-artifact.adoc
index b7fef30..5006963 100644
--- a/asciidoc/ivyfile/dependency-artifact.adoc
+++ b/asciidoc/ivyfile/dependency-artifact.adoc
@@ -19,8 +19,8 @@
*Tag:* artifact *Parent:* link:../ivyfile/dependency.html[dependency]
-This feature gives you more control on a dependency for which you do not control its ivy file.
-It enables to specify the artifacts required, if the dependency has no ivy file.
+This feature gives you more control on a dependency for which you do not control its ivy file.
+It enables to specify the artifacts required, if the dependency has no ivy file.
Indeed, when a module has no ivy file, it is assumed that it publishes exactly one artifact having the same name as the module itself. But when this module publishes more artifacts, or simply does not respect the name rule, and if you cannot deliver an ivy file for it (because you do not control the repository, for instance - think about maven ibiblio repository, to give no name), then this feature let you specify the artifacts names you want to get.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/dependency-conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependency-conf.adoc b/asciidoc/ivyfile/dependency-conf.adoc
index 7d0fe38..b970308 100644
--- a/asciidoc/ivyfile/dependency-conf.adoc
+++ b/asciidoc/ivyfile/dependency-conf.adoc
@@ -26,7 +26,7 @@ Describes a configuration mapping for a dependency. See also the inline configur
[options="header",cols="15%,50%,35%"]
|=======
|Attribute|Description|Required
-|name|the name of the master configuration to map.
+|name|the name of the master configuration to map.
`$$*$$` wildcard can be used to designate all configurations of this module|Yes
|mapped|a comma separated list of dependency configurations to which this master configuration should be mapped|No, default to the same configuration as master one, unless nested mapped elements are specified
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/dependency-include.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependency-include.adoc b/asciidoc/ivyfile/dependency-include.adoc
index 18645c6..70de200 100644
--- a/asciidoc/ivyfile/dependency-include.adoc
+++ b/asciidoc/ivyfile/dependency-include.adoc
@@ -19,7 +19,7 @@
*Tag:* include *Parent:* link:../ivyfile/dependency.html[dependency]
-This feature gives you more control on a dependency for which you do not control its ivy file.
+This feature gives you more control on a dependency for which you do not control its ivy file.
It enables to restrict the artifacts required by including only the artifacts given here, even if configuration does not a good separation of published artifacts.
Each artifact restriction can be given in the context of particular master configurations. By default, if no configuration is specified, artifacts restriction apply to all master configurations. But you can specify that a restriction applies only to one or several master configurations, using either inline or nested conf specification. In this case, do not forget that if you do not specify any restriction for a particular configuration, then no restriction will apply for this configuration and it will be resolved not taking into account any restriction.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/dependency.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/dependency.adoc b/asciidoc/ivyfile/dependency.adoc
index d6f3306..b64548e 100644
--- a/asciidoc/ivyfile/dependency.adoc
+++ b/asciidoc/ivyfile/dependency.adoc
@@ -56,7 +56,7 @@ The way to determine which revision is the "latest" between two is configurable
*__since 2.0__* The `dependency` tag supports two revision attributes: `rev`, corresponding to the default required dependency revision, and `revConstraint`, corresponding to a dynamic revision constraint applied on this dependency.
-Depending on the link:../use/resolve.html[resolve mode] used, the actual revision used during dependency resolution may vary. These revisions usually differ only for modules published in a repository. When link:../use/deliver.html[deliver] is used, dynamic version constraints are replaced by a stic version constraint, to help build reproducibility. However, the information of the original version constraint is not lost, but rather put in the `revConstraint` attribute. This both ensure better metadata in the repository while still allowing easier build reproducibility.
+Depending on the link:../use/resolve.html[resolve mode] used, the actual revision used during dependency resolution may vary. These revisions usually differ only for modules published in a repository. When link:../use/deliver.html[deliver] is used, dynamic version constraints are replaced by a static version constraint, to help build reproducibility. However, the information of the original version constraint is not lost, but rather put in the `revConstraint` attribute. This both ensure better metadata in the repository while still allowing easier build reproducibility.
== Configurations mapping
@@ -95,7 +95,7 @@ Example: Let's foo be a module with two configurations, A and B, B extending A.
If you don't understand really how this works, do not use it :-)
-*__since 1.4__* `%` can be used as left side operand to mean "all the other configurations". This can be usefull when you only have a specific mapping for some configurations and a default mapping for all the others. For instance, `$$test->runtime;%->default$$` means that the `test` configuration is mapped to the `runtime` configuration, but all the other configurations are mapped to the `default` configuration.
+*__since 1.4__* `%` can be used as left side operand to mean "all the other configurations". This can be useful when you only have a specific mapping for some configurations and a default mapping for all the others. For instance, `$$test->runtime;%->default$$` means that the `test` configuration is mapped to the `runtime` configuration, but all the other configurations are mapped to the `default` configuration.
*__since 1.3__* a fallback mechanism can be used when you are not sure that the dependency will have the required conf. You can indicate to ivy that you want one configuration, but if it isn't present, use another one.
The syntax for specifying this adds the fallback conf between parenthesis right after the required conf.
@@ -104,7 +104,7 @@ For instance, `$$test->runtime(default)$$` means that in the test configuration
*__since 2.1__* It is also possible to define dependencies on configurations intersection. A configuration intersection is defined using a `+` sign to separate the configuration (eg `A+B` means the intersection of configuration A and B). In that case only artifacts and dependencies defined in both configurations in the dependency will be part of the master configuration defining the dependency on the configuration intersection.
-Configuration intersections can also be used when specifying the confs to link:../use/resolve.html[resolve].
+Configuration intersections can also be used when specifying the confs to link:../use/resolve.html[resolve].
Moreover, the mapping `$$*->@$$` is handled as a specific case with configuration intersections: it maps also the intersections. So if one resolve conf `A+B` in a module which defines a dependency with mapping `$$*->@$$`, the mapping `$$*->@$$` is interpreted as `$$A+B->A+B$$` so the intersection of A and B will be resolved in the dependency.
@@ -114,10 +114,10 @@ For instance, if you have:
[source,xml]
----
<configurations>
- <conf name="red" e:axis="color" />
- <conf name="blue" e:axis="color" />
-
- <conf name="windows" e:axis="platform" />
+ <conf name="red" e:axis="color"/>
+ <conf name="blue" e:axis="color"/>
+
+ <conf name="windows" e:axis="platform"/>
<conf name="linux" e:axis="platform"/>
</configurations>
----
@@ -148,7 +148,7 @@ See link:../ivyfile/dependency-artifact.html[dependency artifact] for details.
Finally, the dependency element also supports an a force attribute (since 0.8), which gives an indication
to conflicts manager to force the revision of a dependency to the one given here.
-See link:../ivyfile/conflicts.html[conflicts manager] for details.
+See link:../ivyfile/conflicts.html[conflicts manager] for details.
*__since 1.4__* this tag supports link:../concept.html#extra[extra attributes]
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/exclude.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/exclude.adoc b/asciidoc/ivyfile/exclude.adoc
index d51079c..0f68454 100644
--- a/asciidoc/ivyfile/exclude.adoc
+++ b/asciidoc/ivyfile/exclude.adoc
@@ -19,7 +19,8 @@
*Tag:* exclude *Parent:* link:../ivyfile/dependencies.html[dependencies]
-*__since 2.0__* This feature gives you more control on a dependency for which you do not control its ivy file. It allows to exclude artifacts, modules or organizations from the list of dependencies for the whole module.
+*__since 2.0__* This feature gives you more control on a dependency for which you do not control its ivy file.
+It allows to exclude artifacts, modules or organizations from the list of dependencies for the whole module.
It is very similar to the link:../ivyfile/artifact-exclude.html[dependency exclude] element, except that it applies to a whole module, which can be very useful when a lot of dependencies transitively bring a module you don't want.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/include.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/include.adoc b/asciidoc/ivyfile/include.adoc
index 5582f8c..ee31883 100644
--- a/asciidoc/ivyfile/include.adoc
+++ b/asciidoc/ivyfile/include.adoc
@@ -41,8 +41,7 @@ When delivering an ivy file with such an inclusion, the included configuration f
----
<ivy-module version="1.0">
<info organisation="myorg"
- module="mymodule"
- />
+ module="mymodule"/>
<configurations>
<include file="path/to/included-configurations.xml"/>
<conf name="conf3"/>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/info.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/info.adoc b/asciidoc/ivyfile/info.adoc
index 7213d91..1341746 100644
--- a/asciidoc/ivyfile/info.adoc
+++ b/asciidoc/ivyfile/info.adoc
@@ -49,4 +49,3 @@ Gives identification and basic information about the module this ivy file descri
|=======
After the description, you can also place your own tags in your own namespace. This allow to provide some custom information about the module.
-
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/ivyauthor.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/ivyauthor.adoc b/asciidoc/ivyfile/ivyauthor.adoc
index 5859711..282c5bc 100644
--- a/asciidoc/ivyfile/ivyauthor.adoc
+++ b/asciidoc/ivyfile/ivyauthor.adoc
@@ -19,7 +19,7 @@
*Tag:* ivyauthor *Parent:* link:../ivyfile/info.html[info]
-Gives information about who has contributed to write this ivy file. It does NOT indicate who
+Gives information about who has contributed to write this ivy file. It does NOT indicate who
is the author of the module itself.
== Attributes
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/manager.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/manager.adoc b/asciidoc/ivyfile/manager.adoc
index a1d6f60..6424373 100644
--- a/asciidoc/ivyfile/manager.adoc
+++ b/asciidoc/ivyfile/manager.adoc
@@ -23,7 +23,11 @@
Specify a a conflict manager for one or several dependencies.
-The way to specify a conflict manager is by giving indication to which dependencies the conflict manager applies (by giving organisation and module names or name regexp), and then specifying the conflict manager, either by giving its name or by specifying a fixed revision list, in which case a fixed conflicts manager is used.
+The way to specify a conflict manager is by giving indication to which dependencies
+the conflict manager applies (by giving organisation and module names or name regexp),
+and then specifying the conflict manager, either by giving its name or by
+specifying a fixed revision list, in which case a fixed conflicts manager is used.
+
See link:../ivyfile/conflicts.html[Conflicts Manager] for details on conflicts manager in general.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/mapped.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/mapped.adoc b/asciidoc/ivyfile/mapped.adoc
index b7ffa3b..65c6c6b 100644
--- a/asciidoc/ivyfile/mapped.adoc
+++ b/asciidoc/ivyfile/mapped.adoc
@@ -26,7 +26,7 @@ Describes a mapped dependency configuration for a master configuration.
[options="header",cols="15%,50%,35%"]
|=======
|Attribute|Description|Required
-|name|the name of the dependency configuration mapped.
+|name|the name of the dependency configuration mapped.
`$$*$$` wildcard can be used to designate all configurations of this module|Yes
|=======
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/ivyfile/override.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/override.adoc b/asciidoc/ivyfile/override.adoc
index 86bc79e..38330be 100644
--- a/asciidoc/ivyfile/override.adoc
+++ b/asciidoc/ivyfile/override.adoc
@@ -36,7 +36,7 @@ Note that even though no attribute is required, it makes no sense to set no attr
|Attribute|Description|Required
|org|the name, or an expression matching the name of organisation to which overriding should be applied (see matcher attribute below)|No, defaults to `$$*$$` (match all)
|module|the name, or an expression matching the name of module to which overriding should be applied (see matcher attribute below)|No, defaults to `$$*$$` (match all)
-|branch|the branch to set for all the overriden dependency descriptors|No, by default branch is not overriden
-|rev|the revision to set for all the overriden dependency descriptors|No, by default revision is not overriden
+|branch|the branch to set for all the overridden dependency descriptors|No, by default branch is not overridden
+|rev|the revision to set for all the overridden dependency descriptors|No, by default revision is not overridden
|matcher|the link:../concept.html#matcher[matcher] to use to match the modules for which the conflict manager should be used|No, defaults to `exact`
|=======