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/04/12 14:03:12 UTC
[6/7] ant git commit: Merge tag 'ANT_197_RC1' into 1.9.x
Merge tag 'ANT_197_RC1' into 1.9.x
Tagging RC1 for version 1.9.7 of Ant
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/8e8f4de8
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/8e8f4de8
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/8e8f4de8
Branch: refs/heads/master
Commit: 8e8f4de8fffa7b168f3a273670f7fa7a58fc94c5
Parents: e7840bd cecbf5c
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Apr 12 13:43:03 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Apr 12 13:52:14 2016 +0200
----------------------------------------------------------------------
ReleaseInstructions | 101 ++++++++++++-------
WHATSNEW | 12 +++
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 +-
.../taskdefs/conditions/antversion.xml | 12 +--
30 files changed, 157 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/ReleaseInstructions
----------------------------------------------------------------------
diff --cc ReleaseInstructions
index 080ea5e,c5f8cd4..24eece7f
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@@ -190,47 -134,42 +190,91 @@@ Note: This document was updated in the
The vote will only pass if at least three PMC members have voted +1
and more +1s than -1s have been cast. The vote will run for 3 days.
-
-
-
-
-
--13. Update the files listed at the end of the document (files containing
-- version information) to prepare the development of the next
-- version of Ant on the master branch.
--
--14. If the vote fails, address the problems and recreate the next RC
++15. If the vote fails, address the problems and recreate the next RC
build.
--15. Once the vote has passed, tag the last RC created with the final tag
++16. Once the vote has passed, tag the last RC created with the final tag
-- $ git tag -s -m "Tagging version 1.9.5 of Ant" ANT_195 HASH_OF_LAST_RC
++ $ git tag -s -m "Tagging version 1.9.7 of Ant" rel/1.9.7 HASH_OF_LAST_RC
$ git push --tags
--15. The distrib artifacts should be published the apache dist. It is
++17. The distrib artifacts should be published the apache dist. It is
managed via svnpubsub so the release should be committed to the
subversion repository
https://dist.apache.org/repos/dist/release/ant/.
-- In order to keep the main dist area of a reasonable size, old releases
-- should be removed. They will disapear from the main dist but will still be
-- available via the archive. To do so, just use the "svn rm" command against
-- the artifacts or folders to remove.
--
* commit the new release files to
https://dist.apache.org/repos/dist/release/ant/[source|binaries|manual].
++ * Make https://dist.apache.org/repos/dist/release/ant/README.html
++ point to the new RELEASE-NOTES or a copy of it.
++
* release the maven artifacts using the web interface of nexus under https://repository.apache.org
login using your Apache credentials
in the left pane, below "build promotion", click on the "Stagings Repositories" links
expand org.apache.ant
select the checkbox next to the upload that you just did
and click the button "Release".
-- 4 hours later, the artefacts will be in the maven central repository.
++ 4 hours later, the artifacts will be in the maven central repository.
-- * Make README.html point to the new RELEASE-NOTES or a copy of
-- it.
++18. Update the Apache Reporter System
++
++ https://reporter.apache.org/addrelease.html?ant
++
++19. Address the available version tags in BugZilla. Create new
++ milestone 1.9.8 and version 1.9.7.
++
++20. Add a new release tag to doap_Ant.rdf in Ant's site.
++
++21. checkout the 1.9.x branch, merge the tag but don't push the
++ commit
++
++ $ git checkout 1.9.x
++ $ git merge rel/1.9.7
++
++ Set the version number in several files to the required version of
++ the next 1.9.x release. These are:
++
++ * manual/cover.html
++ * manual/credits.html
++ * build.xml properties : project.version,manifest-version,pom.version
++
++ project.version property in build.xml gets bumped to
++ [newversion]alpha, for example 1.9.8alpha
++
++ manifest-version gets bumped to the exact next release number
++ for example 1.9.8.
++
++ pom.version gets bumped to [newversion]-SNAPSHOT
++ for example 1.9.8-SNAPSHOT.
++
++ * POM files under src/etc/poms and subdirectories
++ if you've got mvn installed
++
++ $ mvn versions:set -DnewVersion=1.9.8-SNAPSHOT -DgenerateBackupPoms=false
++
++ inside src/etc/poms should do the trick.
++
++ * ivy.xml in release subdirectory
++ * WHATSNEW (add a new section)
++ * src/etc/testcases/taskdefs/conditions/antversion.xml
++
++ Amend the merge commit
++
++ $ git add -u
++ $ git commit -a --amend
++ $ git push
++
++22. checkout the master branch, merge the 1.9.x branch
++
++ $ git checkout master
++ $ git merge 1.9.x
++ $ git push
++
++23. wait a few hours for the mirrors to catch up
++
++
16. Update the ant.apache.org site :
@@@ -254,27 -193,27 +298,12 @@@
the production folder - since the site still uses svn and Ant
proper uses git there currently is no way to use the scm for this.
--17. Address the available version tags in BugZilla. Create new
-- milestones and versions 1.9.6.
-- Assign all existing 1.9.5 bugs to 1.9.6.
-- Note that such changes can be done at once by choosing the
-- link "Change several bugs at once" at the bottom of the bug list
-- displaying the 1.9.5 bugs.
--
18. At this point in time, the release is done and announcements are made.
PGP-sign your announcement posts.
Apache mailing lists that should get the announcements:
announce@apache.org, dev@ant and user@ant.
--19. Add a new release tag to doap_Ant.rdf in Ant's site.
--
--20. Update the Apache Reporter System
--
-- https://reporter.apache.org/addrelease.html?ant
--
--21. If you've created a temporary branch you can delete it now.
--
22. You can now reacquaint yourself with your family and friends.
(*) Mirrors : the srcdownload.html, bindownload.html and
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/WHATSNEW
----------------------------------------------------------------------
diff --cc WHATSNEW
index a2dd3d5,a2dd3d5..42eab47
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,3 -1,3 +1,15 @@@
++Changes from Ant 1.9.7 TO Ant 1.9.8
++===================================
++
++Changes that could break older environments:
++-------------------------------------------
++
++Fixed bugs:
++-----------
++
++Other changes:
++--------------
++
Changes from Ant 1.9.6 TO Ant 1.9.7
===================================
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 29de3f6,9a0ee50..a502536
--- 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.9.7alpha"/>
- <property name="project.version" value="1.9.7"/>
++ <property name="project.version" value="1.9.8alpha"/>
<!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
- <property name="pom.version" value="1.9.7-SNAPSHOT"/>
- <property name="pom.version" value="1.9.7"/>
-- <property name="manifest-version" value="1.9.7"/>
++ <property name="pom.version" value="1.9.8-SNAPSHOT"/>
++ <property name="manifest-version" value="1.9.8"/>
<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/8e8f4de8/manual/cover.html
----------------------------------------------------------------------
diff --cc manual/cover.html
index 05bd971,05bd971..92d83fe
--- 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.9.7 User Manual</title>
++<title>Apache Ant 1.9.8 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.9.7 Manual</h1>
-- <p align="left">This is the manual for version 1.9.7 of
++ <h1>Apache Ant™ 1.9.8 Manual</h1>
++ <p align="left">This is the manual for version 1.9.8 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/8e8f4de8/manual/credits.html
----------------------------------------------------------------------
diff --cc manual/credits.html
index 3d7ebc0,3d7ebc0..55b508f
--- a/manual/credits.html
+++ b/manual/credits.html
@@@ -62,7 -62,7 +62,7 @@@
</ul>
<center>
--<p>Version: 1.9.7</p>
++<p>Version: 1.9.8</p>
</center>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/release/ivy.xml
----------------------------------------------------------------------
diff --cc release/ivy.xml
index 1541097,1541097..4ba758c
--- 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.9.7"/>
++ module="ant" revision="1.9.8"/>
<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/8e8f4de8/src/etc/poms/ant-antlr/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-antlr/pom.xml
index 34ffd70,76fa060..06be8e5
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-apache-bcel/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-bcel/pom.xml
index 395e107,a6a5254..e335083
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<name>Apache Ant + BCEL</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-apache-bsf/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-bsf/pom.xml
index aad7b70,2bd2832..d2d0471
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<name>Apache Ant + BSF</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-apache-log4j/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-log4j/pom.xml
index cc9389b,e026177..a1edd89
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<name>Apache Ant + Log4J</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-apache-oro/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-oro/pom.xml
index d34cfce,ce5a305..ddad252
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<name>Apache Ant + Apache Oro</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-apache-regexp/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-regexp/pom.xml
index 22489bd,29a9ca6..fccc397
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<name>Apache Ant + Apache Regexp</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-apache-resolver/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-resolver/pom.xml
index 6911636,6396533..36d87c5
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<name>Apache Ant + Apache Resolver</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-apache-xalan2/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-apache-xalan2/pom.xml
index 557e738,ed0d1b0..dc8f9e8
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-commons-logging/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-commons-logging/pom.xml
index e30836b,fa0ae89..9245dea
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-commons-net/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-commons-net/pom.xml
index 1683fc2,8a7028d..fc7e945
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-jai/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jai/pom.xml
index 4de10fb,b9930aa..e3c1595
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-javamail/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-javamail/pom.xml
index 0c8511b,8a8e296..08cfc90
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-jdepend/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jdepend/pom.xml
index eccfbe7,1ffe1d7..719be49
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-jmf/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jmf/pom.xml
index 02bd10f,350f7db..c492a29
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-jsch/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-jsch/pom.xml
index 2469a0a,3d2c33e..abee077
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-junit/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-junit/pom.xml
index c352cf5,b4fd0fd..eb2b270
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-junit4/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-junit4/pom.xml
index d22dc08,17f45d2..ba0b65d
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-launcher/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-launcher/pom.xml
index 517e78b,cfc25e8..67df991
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<name>Apache Ant Launcher</name>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-netrexx/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-netrexx/pom.xml
index 9df3203,1f8f62c..3c8a924
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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/8e8f4de8/src/etc/poms/ant-swing/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-swing/pom.xml
index 5459943,305c0ed..e7ea852
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant-testutil/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-testutil/pom.xml
index 6109ff1,c901875..5fc918c
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/ant/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant/pom.xml
index b0b82f3,f995df0..9900ae9
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<name>Apache Ant Core</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/poms/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/pom.xml
index e15290e,99cb090..bc96b8d
--- 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.9.7-SNAPSHOT</version>
- <version>1.9.7</version>
++ <version>1.9.8-SNAPSHOT</version>
<packaging>pom</packaging>
<description>master POM</description>
<licenses>
http://git-wip-us.apache.org/repos/asf/ant/blob/8e8f4de8/src/etc/testcases/taskdefs/conditions/antversion.xml
----------------------------------------------------------------------
diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml
index 50b525d,50b525d..33918e4
--- 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.9.7" />
++ <antversion exactly="1.9.8" />
</not>
</condition>
-- Should be exactly 1.9.7
++ Should be exactly 1.9.8
</fail>
</target>
@@@ -45,10 -45,10 +45,10 @@@
<fail>
<condition>
<not>
-- <antversion atleast="1.9.7" />
++ <antversion atleast="1.9.8" />
</not>
</condition>
-- Should be at least 1.9.7
++ Should be at least 1.9.8
</fail>
</target>
@@@ -57,10 -57,10 +57,10 @@@
<fail>
<condition>
<not>
-- <antversion exactly="1.9.7" />
++ <antversion exactly="1.9.8" />
</not>
</condition>
-- Should be exactly 1.9.7
++ Should be exactly 1.9.8
</fail>
</target>
</project>