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 2018/03/27 19:09:22 UTC
[5/5] ant git commit: Merge tag 'rel/1.10.3'
Merge tag 'rel/1.10.3'
Tagging version 1.10.3 of Ant
# gpg: WARNING: unsafe permissions on homedir '/home/stefan/.gnupg'
# gpg: keyserver option 'ca-cert-file' is obsolete; please use 'hkp-cacert' in dirmngr.conf
# gpg: keyserver option 'no-try-dns-srv' is unknown
# gpg: Signature made Di 27 Mär 2018 20:20:02 CEST
# gpg: using DSA key A2115AE15F6B8B72
# gpg: issuer "bodewig@apache.org"
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: key 0000000000000000 occurs more than once in the trustdb
# gpg: Good signature from "Stefan Bodewig <bo...@apache.org>" [ultimate]
# gpg: aka "Stefan Bodewig <st...@freenet.de>" [ultimate]
# gpg: aka "Stefan Bodewig <st...@samaflost.de>" [ultimate]
# Primary key fingerprint: CE80 75A2 5154 7BEE 249B C151 A211 5AE1 5F6B 8B72
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c0e75ae0
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c0e75ae0
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c0e75ae0
Branch: refs/heads/master
Commit: c0e75ae0675706da2813a05c16ab3e30243c182b
Parents: 24dec4c 1b9cc23
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 27 21:05:54 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 27 21:09:04 2018 +0200
----------------------------------------------------------------------
WHATSNEW | 3 +++
build.xml | 6 +++---
manual/cover.html | 6 +++---
manual/credits.html | 2 +-
release/ivy.xml | 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-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 ++--
31 files changed, 85 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/WHATSNEW
----------------------------------------------------------------------
diff --cc WHATSNEW
index abebee6,abebee6..936cb30
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,3 -1,3 +1,6 @@@
++Changes from Ant 1.10.3 TO Ant 1.10.4
++=====================================
++
Changes from Ant 1.10.2 TO Ant 1.10.3
=====================================
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 0965267,b7ca99d..b6eada1
--- 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.3alpha"/>
- <property name="project.version" value="1.10.3"/>
++ <property name="project.version" value="1.10.4alpha"/>
<!-- 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.3-SNAPSHOT"/>
- <property name="pom.version" value="1.10.3"/>
-- <property name="manifest-version" value="1.10.3"/>
++ <property name="pom.version" value="1.10.4-SNAPSHOT"/>
++ <property name="manifest-version" value="1.10.4"/>
<property name="bootstrap.jar" value="ant-bootstrap.jar"/>
<property name="ant.package" value="org/apache/tools/ant"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/manual/cover.html
----------------------------------------------------------------------
diff --cc manual/cover.html
index bbadd5b,bbadd5b..c4375e4
--- a/manual/cover.html
+++ b/manual/cover.html
@@@ -19,13 -19,13 +19,13 @@@
<head>
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
--<title>Apache Ant 1.10.3 User Manual</title>
++<title>Apache Ant 1.10.4 User Manual</title>
</head>
<body>
<h1 class="center"><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
-- <h1 class="center">Apache Ant™ 1.10.3 Manual</h1>
-- <p>This is the manual for version 1.10.3 of <a href="https://ant.apache.org/" target="_top">Apache Ant</a>. If your
++ <h1 class="center">Apache Ant™ 1.10.4 Manual</h1>
++ <p>This is the manual for version 1.10.4 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
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/manual/credits.html
----------------------------------------------------------------------
diff --cc manual/credits.html
index f3aa827,f3aa827..f03f3e2
--- 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.3</p>
++<p class="center">Version: 1.10.4</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/release/ivy.xml
----------------------------------------------------------------------
diff --cc release/ivy.xml
index cac99ba,cac99ba..dedc577
--- 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.3"/>
++ module="ant" revision="1.10.4"/>
<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"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-antlr/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-antlr/pom.xml
index fbb8b91,dc3b5c7..61c5ed7
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-antlr</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-apache-bcel/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-bcel/pom.xml
index 69088f7,f982573..0572636
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-bcel</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<name>Apache Ant + BCEL</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-apache-bsf/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-bsf/pom.xml
index be75413,733ca13..6b76f2d
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-bsf</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<name>Apache Ant + BSF</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-apache-log4j/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-log4j/pom.xml
index 471bb05,5bd1e9f..552f93d
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-log4j</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<name>Apache Ant + Log4J</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-apache-oro/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-oro/pom.xml
index 1683ae5,b494497..8fbe975
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-oro</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<name>Apache Ant + Apache Oro</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-apache-regexp/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-regexp/pom.xml
index 3bd209b,7bc2c7a..24aefb7
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-regexp</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<name>Apache Ant + Apache Regexp</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-apache-resolver/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-resolver/pom.xml
index aa721ab,a307342..9edc2f4
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-resolver</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<name>Apache Ant + Apache Resolver</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-apache-xalan2/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-xalan2/pom.xml
index b49afca,db9b631..513faf6
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-xalan2</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-commons-logging/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-commons-logging/pom.xml
index 40c0447,2b9a922..c5f26af
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-commons-logging</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-commons-net/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-commons-net/pom.xml
index 830c27e,54ddac7..3580f7c
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-commons-net</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-jai/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jai/pom.xml
index 8f7b6f1,8b0ce9d..c62a07d
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jai</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-javamail/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-javamail/pom.xml
index a252da0,f2c61e3..64511d7
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-javamail</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-jdepend/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jdepend/pom.xml
index 3fe5260,1ea3a75..093e2c3
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jdepend</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-jmf/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jmf/pom.xml
index 5acc112,d983cfb..7e92e4d
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jmf</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<name>Apache Ant + JMF</name>
<description>contains the sound task and a soundplayer listener
download the dependency from http://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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-jsch/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jsch/pom.xml
index 802519f,e47a4a9..211d9cc
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-junit/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-junit/pom.xml
index c1ca76c,2d86b7f..b4be43a
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-junit4/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-junit4/pom.xml
index d15c9e7,d168465..91eff43
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit4</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-junitlauncher/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-junitlauncher/pom.xml
index 132cc0c,ba8daf0..aeac919
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junitlauncher</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-launcher/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-launcher/pom.xml
index e7cf3c2,2dcf5c6..0f85d81
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<name>Apache Ant Launcher</name>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-netrexx/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-netrexx/pom.xml
index 934ba9c,f63259b..c5580af
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-netrexx</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<name>Apache Ant + NetRexx</name>
<description>NetRexxC task
dependency can be downloaded from http://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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- Processed too early, before maven-antrun-plugin gets a chance to work:
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-swing/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-swing/pom.xml
index 73ca333,1ad9801..545fada
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-swing</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-testutil/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-testutil/pom.xml
index 43ab38c,24b9ba5..b044c2d
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-testutil</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant-xz/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-xz/pom.xml
index e959201,0f67a50..f072795
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-xz</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/ant/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant/pom.xml
index 3fe400f,e328c24..00a762a
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@@ -27,19 -27,19 +27,19 @@@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<name>Apache Ant Core</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.10.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/poms/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/pom.xml
index 94b19f1,17d3f13..26f8183
--- 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.3-SNAPSHOT</version>
- <version>1.10.3</version>
++ <version>1.10.4-SNAPSHOT</version>
<packaging>pom</packaging>
<description>master POM</description>
<licenses>
http://git-wip-us.apache.org/repos/asf/ant/blob/c0e75ae0/src/etc/testcases/taskdefs/conditions/antversion.xml
----------------------------------------------------------------------
diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml
index 35806c7,35806c7..3032175
--- 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.3" />
++ <antversion exactly="1.10.4" />
</not>
</condition>
-- Should be exactly 1.10.3
++ Should be exactly 1.10.4
</fail>
</target>