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 2016/12/31 10:12:33 UTC
[5/5] ant git commit: Merge tag 'rel/1.10.0' into master and bump
versions
Merge tag 'rel/1.10.0' into master and bump versions
Tagging version 1.10.0 of Ant
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/99711de1
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/99711de1
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/99711de1
Branch: refs/heads/master
Commit: 99711de1fcac26bcc3bc45ef2f6fce6db7dedbb9
Parents: a6a211e 4513641
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Dec 31 11:07:35 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Dec 31 11:11:48 2016 +0100
----------------------------------------------------------------------
ReleaseInstructions | 4 ++++
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-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/pom.xml | 6 +++---
src/etc/poms/pom.xml | 2 +-
src/etc/testcases/taskdefs/conditions/antversion.xml | 4 ++--
30 files changed, 83 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/ReleaseInstructions
----------------------------------------------------------------------
diff --cc ReleaseInstructions
index 0f17cf0,0eb6e62..6cd3627
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@@ -230,6 -231,6 +230,10 @@@ Note: This document was adapted from th
21. checkout the master branch, merge the tag but don't push the
commit
++ [if a release of Ant 1.9.x happened at the same time, deal with
++ the 1.9.x tag on the 1.9.x branch first and merge the 1.9.x branch
++ to master before proceeding here]
++
$ git checkout master
$ git merge rel/1.10.0
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/WHATSNEW
----------------------------------------------------------------------
diff --cc WHATSNEW
index eeffe79,eeffe79..cd71f34
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,3 -1,3 +1,6 @@@
++Changes from Ant 1.10.0 TO Ant 1.10.1
++=====================================
++
Changes from Ant 1.9.7 TO Ant 1.10.0
====================================
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 9e8cc1f,7b606b2..43917ea
--- a/build.xml
+++ b/build.xml
@@@ -34,10 -34,10 +34,10 @@@
<property name="name" value="ant"/>
<!-- this is the groupId of ant in the Maven repository -->
<property name="groupid" value="org/apache/ant"/>
- <property name="project.version" value="1.10.0alpha"/>
- <property name="project.version" value="1.10.0"/>
++ <property name="project.version" value="1.10.1alpha"/>
<!-- 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.0-SNAPSHOT"/>
- <property name="pom.version" value="1.10.0"/>
-- <property name="manifest-version" value="1.10.0"/>
++ <property name="pom.version" value="1.10.1-SNAPSHOT"/>
++ <property name="manifest-version" value="1.10.1"/>
<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/99711de1/manual/cover.html
----------------------------------------------------------------------
diff --cc manual/cover.html
index 59b8e43,59b8e43..c8303ad
--- a/manual/cover.html
+++ b/manual/cover.html
@@@ -19,14 -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.10.0 User Manual</title>
++<title>Apache Ant 1.10.1 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™ 1.10.0 Manual</h1>
-- <p align="left">This is the manual for version 1.10.0 of
++ <h1>Apache Ant™ 1.10.1 Manual</h1>
++ <p align="left">This is the manual for version 1.10.1 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
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/manual/credits.html
----------------------------------------------------------------------
diff --cc manual/credits.html
index d895dfd,d895dfd..5594e83
--- a/manual/credits.html
+++ b/manual/credits.html
@@@ -62,7 -62,7 +62,7 @@@
</ul>
<center>
--<p>Version: 1.10.0</p>
++<p>Version: 1.10.1</p>
</center>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/release/ivy.xml
----------------------------------------------------------------------
diff --cc release/ivy.xml
index f8e13c1,f8e13c1..1b26cf9
--- a/release/ivy.xml
+++ b/release/ivy.xml
@@@ -20,7 -20,7 +20,7 @@@
xsi:noNamespaceSchemaLocation=
"http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="org/apache"
-- module="ant" revision="1.10.0"/>
++ module="ant" revision="1.10.1"/>
<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/99711de1/src/etc/poms/ant-antlr/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-antlr/pom.xml
index 186191c,f6044b4..9fbf4fd
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-apache-bcel/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-bcel/pom.xml
index 610a387,5754c9b..ce35715
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<name>Apache Ant + BCEL</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-apache-bsf/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-bsf/pom.xml
index b757de0,57c37c0..064d696
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<name>Apache Ant + BSF</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-apache-log4j/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-log4j/pom.xml
index 4b48e2b,dd861c3..7fc1038
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<name>Apache Ant + Log4J</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-apache-oro/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-oro/pom.xml
index 30569e1,383ddf7..42e889d
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<name>Apache Ant + Apache Oro</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-apache-regexp/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-regexp/pom.xml
index 9fcafc8,ace5f91..c6430ae
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<name>Apache Ant + Apache Regexp</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-apache-resolver/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-resolver/pom.xml
index 03c017c,6519504..015ca24
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<name>Apache Ant + Apache Resolver</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-apache-xalan2/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-xalan2/pom.xml
index 3e49f1d,570fc0a..06fead6
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-commons-logging/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-commons-logging/pom.xml
index 51ce038,6fdfa31..dbd6f1a
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-commons-net/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-commons-net/pom.xml
index 8e08ec5,44f8389..e96b0a6
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-jai/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jai/pom.xml
index 7d3d9f3,0555d0e..89c5de9
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-javamail/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-javamail/pom.xml
index ac36479,617e23f..cb9f1c9
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-jdepend/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jdepend/pom.xml
index 2f35da3,10ab367..8e5ed80
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-jmf/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jmf/pom.xml
index d040c22,092a174..9ef4769
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-jsch/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jsch/pom.xml
index 1273d87,2989eaa..387ebbd
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-junit/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-junit/pom.xml
index 7ba833e,65ab0d8..79bdb3d
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-junit4/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-junit4/pom.xml
index 7e66219,353e063..595fb3f
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-launcher/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-launcher/pom.xml
index 8f95569,30720b2..b8b81d2
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<name>Apache Ant Launcher</name>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-netrexx/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-netrexx/pom.xml
index 502dbe3,f45a934..33eb2c6
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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/99711de1/src/etc/poms/ant-swing/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-swing/pom.xml
index f41c055,0e1f3ca..6a9faf8
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant-testutil/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-testutil/pom.xml
index c362df2,d4f293a..081a023
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/ant/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant/pom.xml
index e6e4325,078f1f9..dd08f8a
--- 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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-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.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<name>Apache Ant Core</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/poms/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/pom.xml
index c1964cf,f0de9bc..f5e6acb
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@@ -25,7 -25,7 +25,7 @@@ xsi:schemaLocation="http://maven.apache
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <version>1.10.0</version>
++ <version>1.10.1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>master POM</description>
<licenses>
http://git-wip-us.apache.org/repos/asf/ant/blob/99711de1/src/etc/testcases/taskdefs/conditions/antversion.xml
----------------------------------------------------------------------
diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml
index 5dd97c7,5dd97c7..8440f1c
--- 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.0" />
++ <antversion exactly="1.10.1" />
</not>
</condition>
-- Should be exactly 1.10.0
++ Should be exactly 1.10.1
</fail>
</target>