Commit 468b857c authored by Emmanuel Bourg's avatar Emmanuel Bourg

New upstream version 1.9.12

parent 242174c5
......@@ -1495,3 +1495,62 @@ G3GJoHIALPVs33ykG7MKFFqpbJHHc95hcOzs8eVh2/jD53CXILjbhKEGGbejFlx+
RHkiOuu1l6jXCeh/J1R6YidjsDjKWlRkHifMmw==
=j+uw
-----END PGP PUBLIC KEY BLOCK-----
pub rsa4096 2018-06-13 [SC] [expires: 2022-06-13]
8DA70C00DF7AF1B0D2F9DC74DDBCC1270A29D081
uid [ultimate] jaikiran@apache <jaikiran@apache.org>
sig 3 DDBCC1270A29D081 2018-06-13 jaikiran@apache <jaikiran@apache.org>
sub rsa4096 2018-06-13 [E] [expires: 2022-06-13]
sig DDBCC1270A29D081 2018-06-13 jaikiran@apache <jaikiran@apache.org>
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQINBFsgsskBEACy8rzosITgdGsfQijFhWkRo/iyXv7LdSD5FezMu6C4UosENKlP
85y0XBsE3Z7K50uxVizyjXTetK+EIS684c6pU1t0vbWyvJzSgHeqf0GEaqiUNWTo
9Jk6jAaeYeNu+6/TVUCYrb+zmQqmJPZq5W4FvTnpRed/t4zBPLlFPe2+QNaNRE03
JqCrnmih0hrxVcM5jyynXSozuS50DcMuiOCZL3zPBW6mDGaXH6+yUfFVrReuCB//
D0u0sCSiV5TvhSh2+8lLUG5tuvOKfg2SlRFtF9JQIPsm/qV/fK2muW2mc+Ti0n+k
3gzxtr4eC5YvShJCe0DoxR9q/CItx6vRg8h+G4HhL1P5N+Tj4N0zfcUs/2vaJbm3
LrjK8o+coNa8dgiIN6AbdcS8szIRYUG2MJzUI1mggYw/i4YcnNhrKTPZtdbKRfmK
AIq1d1eEt/rJ97ypTzeYO6jq6Jkmnb3rWzmx9XA9Mo4J8X7587E6zkiD3FoFrSaM
o20q+byMuXC8kKIEiDOa7UFQUh1ku8RDAmjXlWwqw3+RtrRt0TXoHRNWRoShiBee
TjkQ3ZW7FlSk1hs80qeVCcSJ6lf1texmZzonAJCyibEWdzvceGvs2/PenetsnP/5
nDlJuEs4jhoYuU57HjXfcSSOqmLAFAym7pL0Yd+KNhvxjBF/SoJ1wgoLBQARAQAB
tCVqYWlraXJhbkBhcGFjaGUgPGphaWtpcmFuQGFwYWNoZS5vcmc+iQJUBBMBCAA+
FiEEjacMAN968bDS+dx03bzBJwop0IEFAlsgsskCGwMFCQeGH4AFCwkIBwIGFQoJ
CAsCBBYCAwECHgECF4AACgkQ3bzBJwop0IECdA/+OTyhXffGztoNrvIYF9tamNCV
T5dzzY9qOos6pHShgX6O3xic33UMt3O6ec6RSILEmc1IJlthmxVTsu0XJ57+eDYJ
zzA1JYD1RkLcS6+aqmopfoPdpzOftshQ8yEXPKQl69IhKn0B6yQc98d3EHYQtun0
t9fwQA3LGoMWH7RIsFycMKi6+Z6TOaLdkpNs9ipuIGkouNdqdVTIgQGBmHvQwgO6
r6mYSiApE7lQ8+s/7J1hJuA3GzV9gQ8DK9g0hr1E1EmbG9enxn2XT2V4H4hXFJfr
CEYjMTsa6EYEOnA4BqwMmBHx2LOClydhPOJbc3/09XzAUdwUsxbVgByZ1kUvfo76
eLYC2/YXtyVluLyYwUyGLXlBWMChHM+AIVyTg7HNVvFF99cwdpBgpDjUFx60+ftY
fFxXJJbu4lq1ULKOyqqoDwaebp2C/gZ3bIVmqZ2GFUCoeIuBh94pRhENK/O0FBua
Bp3mYaGrpDVMglu1p9lxz0H2uuAUgXu1hRM7GWbq5TWUKcD/zb6NH7DO82cRqCJE
n//p3Wqc4tAZt8B3bQGQWRGQ3iOU8RxmDvyneuVyqWR0dIkb7ByjtD7SKRkSomNq
6o6mw+Kuj+6M0dwhZdmPB8O/RiLLJDKL83DZN6P+yEBIsc73qS3QPnCuvENPfxgm
0JI2d63wnXbW4bkOzN+5Ag0EWyCyyQEQAKwUmKfCA62QiJwk+NAHfVmrXgk6lpSC
ExCjC8RvWgt7R6upLfOdKFLRLNR4aybLF9/XcW5rsmfF7eTonsA3vnIsfLHtLazL
MoUVgj9jZjlvjcxWX5F8pXL7BH0x443GZvZNIdIt9SCOPJUKVZfc9VCcvw564E8q
IbFJBSCPVMTibPNLZw5N3Iv5WfdqRsIg70jURqiSOMDnn1VpXid0X5iU0ruqlqi5
giud8p/1isBtVQyiGmpDs2UoPaUFUxmIWJ/srxNx5fAyOKd2WsWALn0nJuaIlL0A
25zTzLU3WpTkHFvimWH8ogonXtjLQfh70GJ4NjBhIAjtQFVptGGNLleDVTD1AIMN
imc7GxFGf4EUAgK8fcDrF6WtLtK3QnA3hSXHMgzpLo1NmirWy1cfvwNwnse7KCX/
+axld1slAgnNZl3UADj2irI/j1bl2ntsriE0Q1N+n729G3zlkg0Twj/IjPxo1PW6
5A7b62PDhGtajdwfPKM43dHgJ8ZYGL/zaKt4elhsVQPBZcUOl6YV9fg9c5jqAJhU
IbhfuyQW+/EGYnR4/2G3wbIKiYPsuBiQw4nN1IdGTpfoW9DymYpIcrLJZkt2/4qe
SxXxHa1/qF7CjOoNV5Vza17+mLRS2NN7/Hz+lcyIuYf7dzLJ/U/DIyK4QBcCqm72
9ISsCgK2Hbd3ABEBAAGJAjwEGAEIACYWIQSNpwwA33rxsNL53HTdvMEnCinQgQUC
WyCyyQIbDAUJB4YfgAAKCRDdvMEnCinQgTfiD/9C1jk1iTIeh8KZDQOEkwVXEjIw
Dng0fxSq3ICNjyH58JGysFbOTIyVoqaDPcIWM5/IAbF4DpuXZvaVu0nufpVKupIi
Lq2jRwXC14G+gC/BEsB7KVqzoon/zhKlHEo6sVtumckFVtjXG9SfAqf3q8rSGwaS
WzSOrg7gyKznizOPBWs1kkJ9h+Paj48uP9EUYIr+s8BVlXSRr4TDF++/drPhZ2sz
uphS8fr1fedfaBD++xMmpGEGE2KenTk3oBjvBHusHsSdoqw8IaZ0Bhc4vajuqHWE
4nacvBGaIp5so5kA+MFf69l/G/+cWj+PP7xuGPy9TkqKXi8CNdQE1iEa6UKhBYaA
xpRzaugIDDhSnu9WcoaGixpGVCYojRW1+OloumEhl7WkiWfq3db0q/+uoSJEPqmQ
M7+i7Z6/vPI/3Nu+NvFsDygQA97FF1Tl1ISxfWgd3YplQjuTLLyawxWT7fHKCrx4
TjUM+JPy+xGDd/RP/YksSfM9dsV/EEruN02qBDoUADpuhw0vkKC/OAxuLkWDm0h9
S3vUQ3zGioMMYLvbNe8rAP3VC5fJ7H80spv/z05JfO7c4hutU8D0ykQ0ZNuWdL79
2HEociC3YdVmiCxmvsabeeOeMVU0WgFSHjPRqfPnoSu4ytA0Szn2dsZ64VV01BHm
3rZzxBZRMmQz3CJrMw==
=vLW3
-----END PGP PUBLIC KEY BLOCK-----
Changes from Ant 1.9.11 TO Ant 1.9.12
=====================================
Changes that could break older environments:
-------------------------------------------
* <unzip>, <unjar> and <untar> will no longer extract entries whose
names would make the created files be placed outside of the
destination directory anymore by default. A new attribute
allowFilesToEscapeDest can be used to override the behavior.
Another special case is when stripAbsolutePathSpec is false (which
no longer is the default) and the entry's name starts with a
(back)slash and allowFilesToEscapeDest hasn't been specified
explicitly, in this case the file may be created outside of the
dest directory as well.
In addition stripAbsolutePathSpec is now true by default.
Based on a recommendation by the Snyk Security Research Team.
Fixed bugs:
-----------
* Delay the class initialization of the test classes until they are
passed to JUnit. This way we can avoid that failing static initializers
from non-test classes are reported as error when the 'skipNonTests' option
is 'true'.
Bugzilla Report 60062
* The junit task when used with includeantruntime="no" was incorrectly
printing a warning about multiple versions of ant detected in path
* Default and SecureInputHandler will now raise an error when then
end of the inout stream (usually System.in or System.console) are
reached before a valid input has been read.
* junitreport does not list testsuites that fail to start any tests
because of an exception inside the all-tests and alltests-errors frames.
Bugzilla Report 62443
Other changes:
--------------
* PumpStreamHandler now explicitly verifies the streams for output
and error are not null and will throw an exception if they
are. This way creating a PumpStreamHandler will fail early as
opposed to some obscure errors later when closing streams or
finishing threads might fail.
Bugzilla Report 62148
* <property> has a new attribute runtime which can be used to set
properties with values taken as snapshots from the
availableProcessors, freeMemory, maxMemory and totalMemory methods
of the Java Runtime class.
* <resourcelist> has a new basedir attribute that can be used to
resolve relative names and provides a root for the FileResources
generated.
Bugzilla Report 62379
* The <includesfile> and <excludesfile> nested elements of
<patternset> and <fileset> now support an encoding attribute that
can be used to specify the file's encoding.
Bugzilla Report 62379
Changes from Ant 1.9.10 TO Ant 1.9.11
=====================================
Changes that could break older environments:
-------------------------------------------
* Previous versions of Ant's copy task would throw a BuildException
if the "name" of the resource to copy was null. Starting
this version, the copy task instead silently skips such resources
and no longer throws an exception.
ant-dev list https://www.mail-archive.com/dev@ant.apache.org/msg46634.html
Fixed bugs:
-----------
* Fixed NullPointerException when a mappedresource is used in pathconvert
Bugzilla Report 62076
* Added a workaround for a bug in the jarsigner tool to <verifyjar>
which requires the -storepass command line argument when verifying
signatures using -strict together with a PKCS12 keystore. Unlike
when signing the jar it will not prompt for the keystore's password
and read it from standard input.
This means Ant will now pass the keystore's password on the command
line when using <verifyjar>, which poses a security risk you should
be aware of.
Bugzilla Report 62194
Other changes:
--------------
* when running on Java 11+ rmic will fail early if iiop or idl are
requested. Java11 removes support for CORBA and the switches have
been removed from the rmic tool.
Changes from Ant 1.9.9 TO Ant 1.9.10
====================================
......
......@@ -31,12 +31,12 @@
-->
<property name="Name" value="Apache Ant"/>
<property name="name" value="ant"/>
<!-- this is the groupId of ant in the Maven repository -->
<!-- this is the directory corresponding to groupId of Ant in the Maven repository -->
<property name="groupid" value="org/apache/ant"/>
<property name="project.version" value="1.9.10"/>
<property name="project.version" value="1.9.12"/>
<!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
<property name="pom.version" value="1.9.10"/>
<property name="manifest-version" value="1.9.10"/>
<property name="pom.version" value="1.9.12"/>
<property name="manifest-version" value="1.9.12"/>
<property name="bootstrap.jar" value="ant-bootstrap.jar"/>
<property name="ant.package" value="org/apache/tools/ant"/>
......@@ -45,7 +45,7 @@
<property name="optional.package" value="${taskdefs.package}/optional"/>
<property name="type.package" value="${ant.package}/types"/>
<property name="optional.type.package" value="${type.package}/optional"/>
<property name="apache.resolver.type.package" value="${ant.package}/types/resolver"/>
<property name="apache.resolver.type.package" value="${type.package}/resolver"/>
<property name="util.package" value="${ant.package}/util"/>
<property name="regexp.package" value="${util.package}/regexp"/>
......@@ -60,14 +60,14 @@
<property name="src.dir" value="src"/>
<property name="java.dir" value="${src.dir}/main"/>
<property name="script.dir" value="${src.dir}/script"/>
<property name="lib.dir" value="lib"/>
<property name="manual.dir" value="manual"/>
<property name="etc.dir" value="${src.dir}/etc"/>
<property name="resource.dir" value="${src.dir}/resources"/>
<property name="src.junit" value="${src.dir}/tests/junit"/>
<property name="src.antunit" value="${src.dir}/tests/antunit"/>
<property name="tests.etc.dir" value="${src.dir}/etc/testcases"/>
<property name="manifest" value="${src.dir}/etc/manifest"/>
<property name="resource.dir" value="${src.dir}/resources"/>
<property name="etc.dir" value="${src.dir}/etc"/>
<property name="tests.etc.dir" value="${etc.dir}/testcases"/>
<property name="manifest" value="${etc.dir}/manifest"/>
<property name="lib.dir" value="lib"/>
<property name="manual.dir" value="manual"/>
<!--
===================================================================
......@@ -84,11 +84,11 @@
<property name="build.tests.javadocs" value="${build.dir}/javadocs.test/"/>
<property name="build.junit.xml" location="${build.tests}/xml"/>
<property name="build.junit.tmpdir" location="${build.tests}/tmp"/>
<property name="build.junit.reports" location="${build.tests}/reports"/>
<property name="antunit.xml" location="${build.dir}/antunit/xml"/>
<property name="antunit.tmpdir" location="${build.dir}/antunit/tmp"/>
<property name="antunit.reports" location="${build.dir}/antunit/reports"/>
<property name="antunit.loglevel" value="none"/>
<property name="build.junit.reports" location="${build.tests}/reports"/>
<property name="manifest.tmp" value="${build.dir}/optional.manifest"/>
<!-- the absolute path -->
<property name="build.tests.value" location="${build.tests}"/>
......@@ -957,9 +957,9 @@
<macrodef name="checksums">
<element name="resources" implicit="true"/>
<sequential>
<checksums-mvn>
<checksum algorithm="sha1">
<resources/>
</checksums-mvn>
</checksum>
<checksum fileext=".sha512" algorithm="sha-512">
<resources/>
</checksum>
......@@ -1288,13 +1288,11 @@
<checksums>
<fileset dir="${dist.base.binaries}/">
<exclude name="**/*.asc"/>
<exclude name="**/*.md5"/>
<exclude name="**/*.sha1"/>
<exclude name="**/*.sha512"/>
</fileset>
<fileset dir="${dist.base.manual}/">
<exclude name="**/*.asc"/>
<exclude name="**/*.md5"/>
<exclude name="**/*.sha1"/>
<exclude name="**/*.sha512"/>
</fileset>
......@@ -1338,7 +1336,6 @@
<checksums>
<fileset dir="${dist.base.source}/">
<exclude name="**/*.asc"/>
<exclude name="**/*.md5"/>
<exclude name="**/*.sha1"/>
<exclude name="**/*.sha512"/>
</fileset>
......@@ -1936,6 +1933,9 @@ ${antunit.reports}
</length>
</target>
<!-- JetBrains builds need this target -->
<target name="printFailingTests" depends="print-failing-tests"/>
<target name="print-failing-tests">
<property name="failingtests.dir" value="${build.dir}/errors"/>
<mkdir dir=""/>
......
......@@ -109,6 +109,7 @@ Set -Ddest=LOCATION on the command line
<attribute name="project"/>
<attribute name="archive" default="@{project}"/>
<attribute name="repository" default="${m2.repo}"/>
<attribute name="id" default="central"/>
<sequential>
<fail>
Unknown archive @{archive} -no property @{archive}.version defined in ${lib.dir}/libraries.properties.
......@@ -118,7 +119,6 @@ Set -Ddest=LOCATION on the command line
</not>
</condition>
</fail>
<artifact:remoteRepository url="@{repository}" id="central"/>
<artifact:dependencies pathID="@{archive}.path" useScope="runtime">
<dependency groupId="@{project}"
artifactId="@{archive}"
......@@ -127,6 +127,7 @@ Set -Ddest=LOCATION on the command line
<exclusion groupId="org.apache.ant" artifactId="ant"/>
<exclusion groupId="org.apache.ant" artifactId="ant-launcher"/>
</dependency>
<artifact:remoteRepository url="@{repository}" id="@{id}"/>
</artifact:dependencies>
<!-- now we are left with the problem of getting the files into our directory -->
<copy todir="${dest.dir}">
......@@ -329,9 +330,9 @@ Set -Ddest=LOCATION on the command line
<target name="jai"
description="load Java Advanced Imaging"
depends="init">
<f2 project="javax.media" archive="jai-core"
<f2 project="javax.media" archive="jai-core" id="jboss"
repository="https://repository.jboss.org/nexus/content/groups/public/"/>
<f2 project="com.sun.media" archive="jai-codec"
<f2 project="com.sun.media" archive="jai-codec" id="jboss"
repository="https://repository.jboss.org/nexus/content/groups/public/"/>
</target>
......
......@@ -171,12 +171,12 @@ These tags can pass XSL parameters to the stylesheet.
<h4>classpath</h4>
<p><em>Since Ant 1.9.5.</em>
Like for the <a href="../CoreTasks/style.html#classpath">XSLT task</a>,
Like for the <a href="../Tasks/style.html#classpath">XSLT task</a>,
a nested &lt;classpath&gt; will be used to load the processor.</p>
<h4>factory</h4>
<p><em>Since Ant 1.9.5.</em>
Like for the <a href="../CoreTasks/style.html#factory">XSLT task</a>,
Like for the <a href="../Tasks/style.html#factory">XSLT task</a>,
a nested &lt;factory&gt; can be used to specify factory settings.</p>
......
......@@ -49,6 +49,13 @@ resource) in the project. Properties are case sensitive.</p>
<li>By setting the <i>environment</i> attribute with a prefix to use.
Properties will be defined for every environment variable by
prefixing the supplied name and a period to the name of the variable.</li>
<li>By setting the <i>runtime</i> attribute with a prefix to use.
Properties <code>prefix.availableProcessors</code>,
<code>prefix.freeMemory</code>, <code>prefix.totalMemory</code>
and <code>prefix.maxMemory</code> will be defined with values
returned by the corresponding methods of
the <a href="https://docs.oracle.com/javase/10/docs/api/java/lang/Runtime.html">Runtime</a>
class.</li>
</ul>
<p>Although combinations of these ways are possible, only one should be used
at a time. Problems might occur with the order in which properties are set, for
......@@ -99,7 +106,7 @@ to end with <tt>.xml</tt>.</p>
<td valign="top">resource</td>
<td valign="top"> the name of the classpath resource containing
properties settings in properties file format.</td>
<td valign="middle" align="center" rowspan="4">One of these, when
<td valign="middle" align="center" rowspan="5">One of these, when
<b>not</b> using the name attribute</td>
</tr>
<tr>
......@@ -126,6 +133,22 @@ to end with <tt>.xml</tt>.</p>
system path variable is set to an Ant property named "env.Path"
rather than "env.PATH".</td>
</tr>
<tr>
<td valign="top">runtime</td>
<td valign="top">the prefix to use when retrieving runtime properties. Thus
if you specify runtime=&quot;myrt&quot; you will be able to access
runtime values corresponding to methods in
the <a href="https://docs.oracle.com/javase/10/docs/api/java/lang/Runtime.html">Runtime</a>
class via property names &quot;myrt.availableProcessors&quot;,
&quot;myrt.maxMemory&quot;, &quot;myrt.totalMemory&quot; or
&quot;myrt.freeMemory&quot;. Note that if you supply a property name with a final
&quot;.&quot; it will not be doubled; i.e. runtime=&quot;myrt.&quot; will still
allow access of runtime properties as e.g. &quot;myrt.maxMemory&quot;.<br>
Note also that the property values are snapshots taken at the point in time
when the <code>property</code> has been executed.
<em>Since Ant 1.9.12</em>
</td>
</tr>
<tr>
<td valign="top">classpath</td>
<td valign="top">the classpath to use when looking up a resource.</td>
......
......@@ -74,6 +74,14 @@ attribute. or a nested element.
project contains a compiler implementation for this task as well,
please consult miniRMI's documentation to learn how to use it.</p>
<h4>CORBA support</h4>
<p>Java 11 removes the CORBA and JavaEE packages and rmic no longer
supports either <code>iiop</code> nor <code>idl</code>. Starting
with Ant 1.9.11 the rmic task will fail when using either while
running Java11+ unless you fork the task and explicitly specify an
executable.</p>
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
<tr>
......@@ -168,7 +176,10 @@ please consult miniRMI's documentation to learn how to use it.</p>
</tr>
<tr>
<td valign="top">iiop</td>
<td valign="top">indicates that portable (RMI/IIOP) stubs should be generated</td>
<td valign="top">indicates that portable (RMI/IIOP) stubs should
be generated.<br/>
See the note on CORBA support above.
</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
......@@ -178,7 +189,8 @@ please consult miniRMI's documentation to learn how to use it.</p>
</tr>
<tr>
<td valign="top">idl</td>
<td valign="top">indicates that IDL output files should be generated</td>
<td valign="top">indicates that IDL output files should be
generated.<br/> See the note on CORBA support above.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
......
......@@ -66,7 +66,9 @@ and <tt>lazy</tt> is false, the JAR is signed.</li>
</tr>
<tr>
<td valign="top">storepass</td>
<td valign="top">password for keystore integrity.</td>
<td valign="top">password for keystore integrity. Ant will not use
the <code>-storepass</code> command line argument but send the
password to jarsigner when it prompts for it.</td>
<td valign="top" align="center">Yes.</td>
</tr>
<tr>
......
......@@ -126,7 +126,8 @@ archive.</p>
Note that this changes the entry's name before applying
include/exclude patterns and before using the nested mappers (if
any). <em>since Ant 1.8.0</em></td>
<td valign="top" align="center">No, defaults to false</td>
<td valign="top" align="center">No, defaults to true since 1.9.12
(used to defaukt to false prior to that)</td>
</tr>
<tr>
<td valign="top">scanForUnicodeExtraFields</td>
......@@ -138,6 +139,15 @@ archive.</p>
zip task page</a></td>
<td align="center" valign="top">No, defaults to true</td>
</tr>
<tr>
<td valign="top">allowFilesToEscapeDest</td>
<td valign="top">Whether to allow the extracted file or directory
to be outside of the dest directory.
<em>since Ant 1.9.12</em></td>
<td valign="top" align="center">No, defaults to false unless
stripAbsolutePathSpec is false and the entry's name starts with a leading
path spec.</td>
</tr>
</table>
<h3>Examples</h3>
<pre>
......
......@@ -52,8 +52,12 @@ supported
</tr>
<tr>
<td valign="top">storepass</td>
<td valign="top">password for keystore integrity.</td>
<td valign="top" align="center">Yes.</td>
<td valign="top">password for keystore integrity.
Note that
jarsigner does not read the password from stdin during
verification, so the password must be send via a command line
interface and may be visible to other users of the system.</td>
<td valign="top" align="center">No.</td>
</tr>
<tr>
<td valign="top">keystore</td>
......
......@@ -125,6 +125,11 @@ you can use to test the existence of a property.</p>
<b>not</b> set</a>.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">encoding</td>
<td valign="top">The encoding of the file. <em>Since Ant 1.9.12</em></td>
<td valign="top" align="center">No, default is platform default</td>
</tr>
</table>
<h4><code>patternset</code></h4>
<p>Patternsets may be nested within one another, adding the nested
......
......@@ -1334,6 +1334,15 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
<td valign="top">The encoding of the nested resources</td>
<td valign="top" align="center">No, default is platform default</td>
</tr>
<tr>
<td valign="top">basedir</td>
<td valign="top">Base directory that is used to resolve
relative file names against. Is also used to provide a base
directory to the FileResources created by this resource
collection. <em>Since Ant 1.9.12</em>
</td>
<td valign="top" align="center">No</td>
</tr>
</table>
</blockquote>
......
......@@ -19,14 +19,14 @@
<head>
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
<title>Apache Ant 1.9.10 User Manual</title>
<title>Apache Ant 1.9.12 User Manual</title>
</head>
<body bgcolor="#FFFFFF">
<div align="center">
<h1><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
<h1>Apache Ant&trade; 1.9.10 Manual</h1>
<p align="left">This is the manual for version 1.9.10 of
<h1>Apache Ant&trade; 1.9.12 Manual</h1>
<p align="left">This is the manual for version 1.9.12 of
<a target="_top" href="http://ant.apache.org/index.html">Apache Ant</a>.
If your version
of Ant (as verified with <tt>ant -version</tt>) is older or newer than this
......
......@@ -62,7 +62,7 @@
</ul>
<center>
<p>Version: 1.9.10</p>
<p>Version: 1.9.12</p>
</center>
......
......@@ -108,7 +108,7 @@ good convention, though.</p>
instantiated and added to this task via its <code>addXXX()</code>
methods, at run time. Child elements corresponding
to <code>addConfiguredXXX()</code> are created at this point but
the actual <code>addCondifgired</code> method is not called.</li>
the actual <code>addConfigured</code> method is not called.</li>
<li>All attributes of this task get set via their corresponding
<code>setXXX</code> methods, at runtime.</li>
......
......@@ -256,11 +256,7 @@ other open source Java runtimes, and so strives to have a product that works wel
|
+--- lib // contains Ant JARs plus necessary dependencies
|
+--- docs // contains documentation
| |
| +--- images // various logos for html documentation
| |
| +--- manual // Ant documentation (a must read ;-)
+--- manual // Ant documentation (a must read ;-)
|
+--- etc // contains xsl goodies to:
// - create an enhanced report from xml output of various tasks.
......
......@@ -296,6 +296,7 @@ h6 {
</xsl:apply-templates>
</xsl:when>
<xsl:when test="$type = 'errors'">
<xsl:apply-templates select=".//testsuite[error]" mode="alltests.error.row"/>
<xsl:apply-templates select=".//testcase[error]" mode="print.test">
<xsl:with-param name="show.class" select="'yes'"/>
</xsl:apply-templates>
......@@ -306,6 +307,7 @@ h6 {
</xsl:apply-templates>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select=".//testsuite[error]" mode="alltests.error.row"/>
<xsl:apply-templates select=".//testcase" mode="print.test">
<xsl:with-param name="show.class" select="'yes'"/>
</xsl:apply-templates>
......@@ -969,4 +971,18 @@ h6 {
<xsl:param name="value"/>
<xsl:value-of select="format-number($value,'0.00%')"/>
</xsl:template>
<xsl:template match="testsuite" mode="alltests.error.row">
<xsl:variable name="package.dir">
<xsl:if test="not(@package = '')"><xsl:value-of select="translate(@package,'.','/')"/><xsl:text>/</xsl:text></xsl:if>
</xsl:variable>
<xsl:variable name="class.href">
<xsl:value-of select="concat($package.dir, @id, '_', @name, '.html')"/>
</xsl:variable>
<tr class="Error">
<td><a href="{$class.href}"><xsl:value-of select="@name"/></a></td>
<td colspan="3"><xsl:apply-templates select="./error"/></td>
</tr>
</xsl:template>
</xsl:stylesheet>
......@@ -27,13 +27,13 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.10</version>
<version>1.9.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-antlr</artifactId>
<version>1.9.10</version>
<version>1.9.12</version>
<name>Apache Ant + ANTLR</name>
<description>antlr specific task.
The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description>
......@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.10</version>
<version>1.9.12</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
......
......@@ -27,19 +27,19 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.10</version>
<version>1.9.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>