1.8.4 is out, bump version
git-svn-id: https://svn.apache.org/repos/asf/ant/core/branches/ANT_18_BRANCH@1341924 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/WHATSNEW b/WHATSNEW
index e4f9036..4adb6c8 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -20,6 +20,10 @@
speed up compression in certain edge cases. Merge from Commons
Compress.
+ Using specially crafted inputs this can be used as a denial of
+ service attack.
+ See http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-2098
+
Changes from Ant 1.8.2 TO Ant 1.8.3
===================================
diff --git a/build.xml b/build.xml
index 2cfa38d..7a0f9f9 100644
--- a/build.xml
+++ b/build.xml
@@ -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.8.4alpha"/>
+ <property name="project.version" value="1.8.5alpha"/>
<!-- 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.8.4-SNAPSHOT"/>
- <property name="manifest-version" value="1.8.4"/>
+ <property name="pom.version" value="1.8.5-SNAPSHOT"/>
+ <property name="manifest-version" value="1.8.5"/>
<property name="bootstrap.jar" value="ant-bootstrap.jar"/>
<property name="ant.package" value="org/apache/tools/ant"/>
diff --git a/manual/cover.html b/manual/cover.html
index ce593eb..c239e85 100644
--- a/manual/cover.html
+++ b/manual/cover.html
@@ -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.8.4 User Manual</title>
+<title>Apache Ant 1.8.5 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.8.4 Manual</h1>
- <p align="left">This is the manual for version 1.8.4 of
+ <h1>Apache Ant™ 1.8.5 Manual</h1>
+ <p align="left">This is the manual for version 1.8.5 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
diff --git a/manual/credits.html b/manual/credits.html
index 643db1c..a786092 100644
--- a/manual/credits.html
+++ b/manual/credits.html
@@ -62,7 +62,7 @@
</ul>
<center>
-<p>Version: 1.8.4</p>
+<p>Version: 1.8.5</p>
</center>
diff --git a/src/etc/testcases/taskdefs/conditions/antversion.xml b/src/etc/testcases/taskdefs/conditions/antversion.xml
index 485ee2d..0321ec8 100644
--- a/src/etc/testcases/taskdefs/conditions/antversion.xml
+++ b/src/etc/testcases/taskdefs/conditions/antversion.xml
@@ -32,10 +32,10 @@
<fail>
<condition>
<not>
- <antversion exactly="1.8.4" />
+ <antversion exactly="1.8.5" />
</not>
</condition>
- Should be exactly 1.8.4
+ Should be exactly 1.8.5
</fail>
</target>
@@ -45,10 +45,10 @@
<fail>
<condition>
<not>
- <antversion atleast="1.8.4" />
+ <antversion atleast="1.8.5" />
</not>
</condition>
- Should be at least 1.8.4
+ Should be at least 1.8.5
</fail>
</target>
@@ -57,10 +57,10 @@
<fail>
<condition>
<not>
- <antversion exactly="1.8.4" />
+ <antversion exactly="1.8.5" />
</not>
</condition>
- Should be exactly 1.8.4
+ Should be exactly 1.8.5
</fail>
</target>
</project>
