You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2021/07/13 17:23:21 UTC
[ant] 02/02: Merge tag 'rel/1.10.11' and prepare for next iteration
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
commit 431f973cd8f8846b7dd86c3d645722246c77f1ef
Merge: b7e2405 01ce0c3
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Tue Jul 13 07:54:52 2021 +0200
Merge tag 'rel/1.10.11' and prepare for next iteration
Apache Ant 1.10.11
WHATSNEW | 5 ++++-
build.xml | 6 +++---
manual/cover.html | 6 +++---
manual/credits.html | 2 +-
release/ivy.xml | 2 +-
snap/snapcraft.yaml | 2 +-
src/etc/poms/ant-antlr/pom.xml | 6 +++---
src/etc/poms/ant-apache-bcel/pom.xml | 6 +++---
src/etc/poms/ant-apache-bsf/pom.xml | 6 +++---
src/etc/poms/ant-apache-log4j/pom.xml | 6 +++---
src/etc/poms/ant-apache-oro/pom.xml | 6 +++---
src/etc/poms/ant-apache-regexp/pom.xml | 6 +++---
src/etc/poms/ant-apache-resolver/pom.xml | 6 +++---
src/etc/poms/ant-apache-xalan2/pom.xml | 6 +++---
src/etc/poms/ant-commons-logging/pom.xml | 6 +++---
src/etc/poms/ant-commons-net/pom.xml | 6 +++---
src/etc/poms/ant-imageio/pom.xml | 6 +++---
src/etc/poms/ant-jai/pom.xml | 6 +++---
src/etc/poms/ant-javamail/pom.xml | 6 +++---
src/etc/poms/ant-jdepend/pom.xml | 6 +++---
src/etc/poms/ant-jmf/pom.xml | 6 +++---
src/etc/poms/ant-jsch/pom.xml | 6 +++---
src/etc/poms/ant-junit/pom.xml | 6 +++---
src/etc/poms/ant-junit4/pom.xml | 6 +++---
src/etc/poms/ant-junitlauncher/pom.xml | 6 +++---
src/etc/poms/ant-launcher/pom.xml | 4 ++--
src/etc/poms/ant-netrexx/pom.xml | 6 +++---
src/etc/poms/ant-swing/pom.xml | 6 +++---
src/etc/poms/ant-testutil/pom.xml | 6 +++---
src/etc/poms/ant-xz/pom.xml | 6 +++---
src/etc/poms/ant/pom.xml | 6 +++---
src/etc/poms/pom.xml | 2 +-
src/etc/testcases/taskdefs/conditions/antversion.xml | 4 ++--
33 files changed, 90 insertions(+), 87 deletions(-)
diff --cc WHATSNEW
index 5a38945,8f3842c..29f4e9c
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,5 -1,5 +1,8 @@@
++Changes from Ant 1.10.11 TO Ant 1.10.12
++=======================================
++
Changes from Ant 1.10.10 TO Ant 1.10.11
- ======================================
+ =======================================
Fixed bugs:
-----------
diff --cc build.xml
index 1b3e996,471c1f7..35ba766
--- a/build.xml
+++ b/build.xml
@@@ -33,10 -33,10 +33,10 @@@
<property name="name" value="ant"/>
<!-- 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.10.11alpha"/>
- <property name="project.version" value="1.10.11"/>
++ <property name="project.version" value="1.10.12alpha"/>
<!-- 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.10.11-SNAPSHOT"/>
- <property name="pom.version" value="1.10.11"/>
-- <property name="manifest-version" value="1.10.11"/>
++ <property name="pom.version" value="1.10.12-SNAPSHOT"/>
++ <property name="manifest-version" value="1.10.12"/>
<property name="bootstrap.jar" value="ant-bootstrap.jar"/>
<property name="ant.package" value="org/apache/tools/ant"/>
diff --cc manual/cover.html
index ad70045,ad70045..52f4ea0
--- a/manual/cover.html
+++ b/manual/cover.html
@@@ -19,13 -19,13 +19,13 @@@
<head>
<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
--<title>Apache Ant 1.10.11 User Manual</title>
++<title>Apache Ant 1.10.12 User Manual</title>
</head>
<body>
<h1 class="center"><img src="images/ant_logo_large.gif" width="190" height="120" alt="Apache Ant logo"></h1>
-- <h1 class="center">Apache Ant™ 1.10.11 Manual</h1>
-- <p>This is the manual for version 1.10.11 of <a href="https://ant.apache.org/" target="_top">Apache Ant</a>. If your
++ <h1 class="center">Apache Ant™ 1.10.12 Manual</h1>
++ <p>This is the manual for version 1.10.12 of <a href="https://ant.apache.org/" target="_top">Apache Ant</a>. If your
version of Ant (as verified with <kbd>ant -version</kbd>) is older or newer than this version then this is not the
correct manual set. Please use the documentation appropriate to your current version. Also, if you are using a
version older than the most recent release, we recommend an upgrade to fix bugs as well as provide new
diff --cc manual/credits.html
index 7e69ec3,7e69ec3..a8ac47f
--- a/manual/credits.html
+++ b/manual/credits.html
@@@ -61,7 -61,7 +61,7 @@@
<li>Craeg Strong (<a href="mailto:cstrong@arielpartners.com">cstrong@arielpartners.com</a>)</li>
</ul>
--<p class="center">Version: 1.10.11</p>
++<p class="center">Version: 1.10.12</p>
</body>
</html>
diff --cc release/ivy.xml
index 5fd3f81,5fd3f81..9504b4e
--- a/release/ivy.xml
+++ b/release/ivy.xml
@@@ -19,7 -19,7 +19,7 @@@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="org/apache"
-- module="ant" revision="1.10.11"/>
++ module="ant" revision="1.10.12"/>
<publications xmlns:e="urn:ant.apache.org:ivy-extras">
<artifact name="ant-parent" type="pom" ext="pom"/>
<artifact name="ant-parent" type="pom.asc" ext="pom.asc"/>
diff --cc snap/snapcraft.yaml
index 0d144cb,7700a02..e1f24fb
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@@ -14,7 -14,7 +14,7 @@@
# limitations under the License.
name: ant
- version: "1.10.11alpha"
-version: "1.10.11"
++version: "1.10.12alpha"
summary: Apache Ant
description: |
Apache Ant™ is a Java library and command-line tool whose mission is
diff --cc src/etc/poms/ant-antlr/pom.xml
index 00efc8e,e4c67e5..a07cdd9
--- a/src/etc/poms/ant-antlr/pom.xml
+++ b/src/etc/poms/ant-antlr/pom.xml
@@@ -27,13 -27,13 +27,13 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-antlr</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</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 +41,7 @@@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
diff --cc src/etc/poms/ant-apache-bcel/pom.xml
index 2ed028d,f8c2fca..6905420
--- a/src/etc/poms/ant-apache-bcel/pom.xml
+++ b/src/etc/poms/ant-apache-bcel/pom.xml
@@@ -27,19 -27,19 +27,19 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-bcel</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + BCEL</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-apache-bsf/pom.xml
index 1d44170,cfc1056..a998bcd
--- a/src/etc/poms/ant-apache-bsf/pom.xml
+++ b/src/etc/poms/ant-apache-bsf/pom.xml
@@@ -27,19 -27,19 +27,19 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-bsf</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + BSF</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-apache-log4j/pom.xml
index caa8945,827cfcc..09dbf31
--- a/src/etc/poms/ant-apache-log4j/pom.xml
+++ b/src/etc/poms/ant-apache-log4j/pom.xml
@@@ -26,19 -26,19 +26,19 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-log4j</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + Log4J</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-apache-oro/pom.xml
index c791be1,2330547..22a0686
--- a/src/etc/poms/ant-apache-oro/pom.xml
+++ b/src/etc/poms/ant-apache-oro/pom.xml
@@@ -27,19 -27,19 +27,19 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-oro</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + Apache Oro</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-apache-regexp/pom.xml
index b2bcf68,0f52bcd..2244500
--- a/src/etc/poms/ant-apache-regexp/pom.xml
+++ b/src/etc/poms/ant-apache-regexp/pom.xml
@@@ -26,19 -26,19 +26,19 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-regexp</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + Apache Regexp</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-apache-resolver/pom.xml
index 33de0ac,b7d9714..b7ba595
--- a/src/etc/poms/ant-apache-resolver/pom.xml
+++ b/src/etc/poms/ant-apache-resolver/pom.xml
@@@ -26,19 -26,19 +26,19 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-resolver</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + Apache Resolver</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-apache-xalan2/pom.xml
index c449e44,91b9ea2..9689a22
--- a/src/etc/poms/ant-apache-xalan2/pom.xml
+++ b/src/etc/poms/ant-apache-xalan2/pom.xml
@@@ -26,20 -26,20 +26,20 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-xalan2</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + Xalan 2</name>
<description>contains Xalan2-specific features</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-commons-logging/pom.xml
index 8a1b66b,c903bb2..1ccbdb8
--- a/src/etc/poms/ant-commons-logging/pom.xml
+++ b/src/etc/poms/ant-commons-logging/pom.xml
@@@ -26,20 -26,20 +26,20 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-commons-logging</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + Commons Logging</name>
<description>Ant Listener based on commons-logging</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-commons-net/pom.xml
index d5f4a6f,4ec4aad..9603114
--- a/src/etc/poms/ant-commons-net/pom.xml
+++ b/src/etc/poms/ant-commons-net/pom.xml
@@@ -26,20 -26,20 +26,20 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-commons-net</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + Commons Net</name>
<description>ftp, rexec and telnet tasks</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-imageio/pom.xml
index a660aed,4380525..7019d3d
--- a/src/etc/poms/ant-imageio/pom.xml
+++ b/src/etc/poms/ant-imageio/pom.xml
@@@ -27,20 -27,20 +27,20 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-imageio</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + ImageIO</name>
<description>imageio task and corresponding types.</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --cc src/etc/poms/ant-jai/pom.xml
index acdf72e,9a52f2a..06d3304
--- a/src/etc/poms/ant-jai/pom.xml
+++ b/src/etc/poms/ant-jai/pom.xml
@@@ -27,13 -27,13 +27,13 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jai</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + JAI</name>
<description>image task and corresponding types.
</description>
@@@ -41,7 -41,7 +41,7 @@@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-javamail/pom.xml
index 4409b71,1dbd184..edf720a
--- a/src/etc/poms/ant-javamail/pom.xml
+++ b/src/etc/poms/ant-javamail/pom.xml
@@@ -26,13 -26,13 +26,13 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-javamail</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + JavaMail</name>
<description>implementation of the mail task based on javamail.
Required to send emails to SMTP servers using user/password combinations
@@@ -41,7 -41,7 +41,7 @@@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-jdepend/pom.xml
index 2c880f5,8d29702..073767b
--- a/src/etc/poms/ant-jdepend/pom.xml
+++ b/src/etc/poms/ant-jdepend/pom.xml
@@@ -27,13 -27,13 +27,13 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jdepend</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + JDepend</name>
<description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the
jdepend parser available on the maven repository</description>
@@@ -41,7 -41,7 +41,7 @@@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-jmf/pom.xml
index 2912b97,69bdda2..612eafb
--- a/src/etc/poms/ant-jmf/pom.xml
+++ b/src/etc/poms/ant-jmf/pom.xml
@@@ -26,13 -26,13 +26,13 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jmf</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + JMF</name>
<description>contains the sound task and a soundplayer listener
download the dependency from https://java.sun.com/products/java-media/jmf/</description>
@@@ -40,7 -40,7 +40,7 @@@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --cc src/etc/poms/ant-jsch/pom.xml
index 29138d2,0307340..56e0505
--- a/src/etc/poms/ant-jsch/pom.xml
+++ b/src/etc/poms/ant-jsch/pom.xml
@@@ -26,13 -26,13 +26,13 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + JSch</name>
<description>contains the sshexec and scp tasks
</description>
@@@ -40,7 -40,7 +40,7 @@@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-junit/pom.xml
index 7e027c7,395831a..1312d39
--- a/src/etc/poms/ant-junit/pom.xml
+++ b/src/etc/poms/ant-junit/pom.xml
@@@ -26,20 -26,20 +26,20 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + JUnit</name>
<description>contains the junit and junirreport tasks</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-junit4/pom.xml
index 7595541,65f6576..8068162
--- a/src/etc/poms/ant-junit4/pom.xml
+++ b/src/etc/poms/ant-junit4/pom.xml
@@@ -26,20 -26,20 +26,20 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit4</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + JUnit 4</name>
<description>contains JUnit 4.x support</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-junitlauncher/pom.xml
index 700d055,8d9e81c..67961b3
--- a/src/etc/poms/ant-junitlauncher/pom.xml
+++ b/src/etc/poms/ant-junitlauncher/pom.xml
@@@ -26,20 -26,20 +26,20 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junitlauncher</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + JUnit 5</name>
<description>contains JUnit 5.x support</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-launcher/pom.xml
index 54714f5,47c83a9..4679a4e
--- a/src/etc/poms/ant-launcher/pom.xml
+++ b/src/etc/poms/ant-launcher/pom.xml
@@@ -27,13 -27,13 +27,13 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant Launcher</name>
<build>
<plugins>
diff --cc src/etc/poms/ant-netrexx/pom.xml
index a30be0d,0419300..a293739
--- a/src/etc/poms/ant-netrexx/pom.xml
+++ b/src/etc/poms/ant-netrexx/pom.xml
@@@ -26,13 -26,13 +26,13 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-netrexx</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + NetRexx</name>
<description>NetRexxC task
dependency can be downloaded from https://www.ibm.com/software/awdtools/netrexx/download.html</description>
@@@ -40,7 -40,7 +40,7 @@@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- Processed too early, before maven-antrun-plugin gets a chance to work:
diff --cc src/etc/poms/ant-swing/pom.xml
index 3992038,4c752e8..10edd2d
--- a/src/etc/poms/ant-swing/pom.xml
+++ b/src/etc/poms/ant-swing/pom.xml
@@@ -27,20 -27,20 +27,20 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-swing</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + Swing</name>
<description>a listener and a splash task based on Swing</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --cc src/etc/poms/ant-testutil/pom.xml
index 878c1fb,9dd57d8..b64d56a
--- a/src/etc/poms/ant-testutil/pom.xml
+++ b/src/etc/poms/ant-testutil/pom.xml
@@@ -27,20 -27,20 +27,20 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-testutil</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant Test Utilities</name>
<description>test utility classes</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant-xz/pom.xml
index 9e1cc0d,232b7a5..10b8488
--- a/src/etc/poms/ant-xz/pom.xml
+++ b/src/etc/poms/ant-xz/pom.xml
@@@ -26,20 -26,20 +26,20 @@@ xsi:schemaLocation="http://maven.apache
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-xz</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant + XZ for Java</name>
<description>contains the xz compression support</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/ant/pom.xml
index acef910,6ba2138..371c5db
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@@ -27,13 -27,13 +27,13 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>https://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<name>Apache Ant Core</name>
<properties>
<modules.exclude>org/apache/tools/ant/taskdefs/modules/</modules.exclude>
@@@ -42,7 -42,7 +42,7 @@@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --cc src/etc/poms/pom.xml
index ae6d5a2,8de6944..95f54c7
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
- <version>1.10.11-SNAPSHOT</version>
- <version>1.10.11</version>
++ <version>1.10.12-SNAPSHOT</version>
<packaging>pom</packaging>
<description>master POM</description>
<licenses>
diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml
index 5ff6eba,5ff6eba..8db4040
--- a/src/etc/testcases/taskdefs/conditions/antversion.xml
+++ b/src/etc/testcases/taskdefs/conditions/antversion.xml
@@@ -32,10 -32,10 +32,10 @@@
<fail>
<condition>
<not>
-- <antversion exactly="1.10.11" />
++ <antversion exactly="1.10.12" />
</not>
</condition>
-- Should be exactly 1.10.11
++ Should be exactly 1.10.12
</fail>
</target>