Port changes for the 2.6 release to the trunk
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1059696 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE.txt b/NOTICE.txt
index c46b194..2f0ca38 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Commons Lang
-Copyright 2001-2010 The Apache Software Foundation
+Copyright 2001-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
diff --git a/pom.xml b/pom.xml
index e5686ca..7cea931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -436,8 +436,8 @@
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
<commons.componentid>lang</commons.componentid>
- <commons.release.version>2.5</commons.release.version>
- <commons.release.desc>(Java 1.2+)</commons.release.desc>
+ <commons.release.version>2.6</commons.release.version>
+ <commons.release.desc>(Java 1.3+)</commons.release.desc>
<commons.release.2.version>3.0-beta</commons.release.2.version>
<commons.release.2.desc>(Java 5.0+)</commons.release.2.desc>
<commons.jira.id>LANG</commons.jira.id>
diff --git a/src/site/changes/changes.xml b/src/site/changes/changes.xml
index 86bdb12..69ac5e1 100644
--- a/src/site/changes/changes.xml
+++ b/src/site/changes/changes.xml
@@ -99,6 +99,36 @@
<action type="fix" issue="LANG-11">Depend on JDK 1.5+.</action>
</release>
+ <release version="2.6" date="2011-01-16" description="Bug Fixes/Enhancements for the 2.6 release (requires minimum of Java 1.3)">
+ <action type="update" issue="LANG-633">BooleanUtils: use same optimization in toBooleanObject(String) as in toBoolean(String)</action>
+ <action type="update" issue="LANG-599">ClassUtils: allow Dots as Inner Class Separators in getClass()</action>
+ <action type="add" issue="LANG-594">DateUtils: equal and compare functions up to most significant field</action>
+ <action type="add" issue="LANG-632">DateUtils: provide a Date to Calendar convenience method</action>
+ <action type="add" issue="LANG-576">ObjectUtils: add clone methods to ObjectUtils</action>
+ <action type="add" issue="LANG-667">ObjectUtils: add a Null-safe compare() method</action>
+ <action type="add" issue="LANG-670">ObjectUtils: add notEqual() method</action>
+ <action type="add" issue="LANG-302">StrBuilder: implement clone() method</action>
+ <action type="add" issue="LANG-640">StringUtils: add a normalizeSpace() method</action>
+ <action type="add" issue="LANG-614">StringUtils: add endsWithAny() method</action>
+ <action type="add" issue="LANG-655">StringUtils: add defaultIfBlank() method</action>
+ <action type="add" issue="LANG-596">StrSubstitutor: add a replace(String, Properties) variant</action>
+ <action type="add" issue="LANG-482">StrSubstitutor: support substitution in variable names</action>
+ <action type="update" issue="LANG-669">Use StrBuilder instead of StringBuffer to improve performance where sync. is not an issue</action>
+ <action type="fix" issue="LANG-629">CharSet: make the underlying set synchronized</action>
+ <action type="fix" issue="LANG-635">CompareToBuilder: fix passing along compareTransients to the reflectionCompare method</action>
+ <action type="fix" issue="LANG-636">ExtendedMessageFormat doesn't override equals(Object)</action>
+ <action type="fix" issue="LANG-645">FastDateFormat: fix to properly include the locale when formatting a Date</action>
+ <action type="fix" issue="LANG-638">NumberUtils: createNumber() throws a StringIndexOutOfBoundsException when argument containing "e" and "E" is passed in</action>
+ <action type="fix" issue="LANG-607">StringUtils methods do not handle Unicode 2.0+ supplementary characters correctly</action>
+ <action type="fix" issue="LANG-624">SystemUtils: getJavaVersionAsFloat throws StringIndexOutOfBoundsException on Android runtime/Dalvik VM</action>
+ <action type="fix" issue="BEANUTILS-381">MemberUtils: getMatchingAccessibleMethod does not correctly handle inheritance and method overloading</action>
+ <action type="update" issue="LANG-600">Javadoc is incorrect for lastIndexOf() method</action>
+ <action type="update" issue="LANG-628">Javadoc for HashCodeBuilder.append(boolean) does not match implementation</action>
+ <action type="update" issue="LANG-643">Javadoc StringUtils.left() claims to throw an exception on negative lenth, but doesn't</action>
+ <action type="update" issue="LANG-370">Javadoc - document thread safety</action>
+ <action type="update" issue="LANG-623">Test for StringUtils replaceChars() icelandic characters</action>
+ </release>
+
<release version="2.5" date="2010-02-25" description="">
<action type="add" issue="LANG-583">ArrayUtils - add isNotEmpty() methods</action>
<action type="add" issue="LANG-534">ArrayUtils - add nullToEmpty() methods</action>
diff --git a/src/site/site.xml b/src/site/site.xml
index 6a827f4..abbd5fa 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -28,7 +28,7 @@
<item name="Download" href="/download_lang.cgi"/>
<item name="Users guide" href="/userguide.html"/>
<item name="Release History" href="/release-history.html"/>
- <item name="Javadoc (2.5 release)" href="api-release/index.html"/>
+ <item name="Javadoc (2.6 release)" href="api-release/index.html"/>
</menu>
<menu name="Development">
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
index ab899df..518ab90 100644
--- a/src/site/xdoc/building.xml
+++ b/src/site/xdoc/building.xml
@@ -31,6 +31,7 @@
You may also be interested in the upgrade notes:
</p>
<ul>
+ <li>Upgrade from 2.5 to 2.6 - <a href="upgradeto2_6.html">Lang 2.6 Release Notes</a></li>
<li>Upgrade from 2.4 to 2.5 - <a href="upgradeto2_5.html">Lang 2.5 Release Notes</a></li>
<li>Upgrade from 2.3 to 2.4 - <a href="upgradeto2_4.html">Lang 2.4 Release Notes</a></li>
<li>Upgrade from 2.2 to 2.3 - <a href="upgradeto2_3.html">Lang 2.3 Release Notes</a></li>
diff --git a/src/site/xdoc/download_lang.xml b/src/site/xdoc/download_lang.xml
index 634df95..64a41ac 100644
--- a/src/site/xdoc/download_lang.xml
+++ b/src/site/xdoc/download_lang.xml
@@ -95,32 +95,32 @@
</p>
</subsection>
</section>
- <section name="Commons Lang 2.5 (Java 1.2+)">
+ <section name="Commons Lang 2.6 (Java 1.3+)">
<subsection name="Binaries">
<table>
<tr>
- <td><a href="[preferred]/commons/lang/binaries/commons-lang-2.5-bin.tar.gz">commons-lang-2.5-bin.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.5-bin.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.5-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/lang/binaries/commons-lang-2.6-bin.tar.gz">commons-lang-2.6-bin.tar.gz</a></td>
+ <td><a href="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.6-bin.tar.gz.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.6-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/lang/binaries/commons-lang-2.5-bin.zip">commons-lang-2.5-bin.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.5-bin.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.5-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/lang/binaries/commons-lang-2.6-bin.zip">commons-lang-2.6-bin.zip</a></td>
+ <td><a href="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.6-bin.zip.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.6-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/commons/lang/source/commons-lang-2.5-src.tar.gz">commons-lang-2.5-src.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/lang/source/commons-lang-2.5-src.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/lang/source/commons-lang-2.5-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/lang/source/commons-lang-2.6-src.tar.gz">commons-lang-2.6-src.tar.gz</a></td>
+ <td><a href="http://www.apache.org/dist/commons/lang/source/commons-lang-2.6-src.tar.gz.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/lang/source/commons-lang-2.6-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/lang/source/commons-lang-2.5-src.zip">commons-lang-2.5-src.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/lang/source/commons-lang-2.5-src.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/lang/source/commons-lang-2.5-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/lang/source/commons-lang-2.6-src.zip">commons-lang-2.6-src.zip</a></td>
+ <td><a href="http://www.apache.org/dist/commons/lang/source/commons-lang-2.6-src.zip.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/lang/source/commons-lang-2.6-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 48b7ab5..7def988 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -48,7 +48,8 @@
</p>
<ul>
<li>The <a href="api-3.0-beta/index.html">beta release 3.0-beta</a></li>
-<li>The <a href="api-2.5/index.html">current stable release 2.5</a></li>
+<li>The <a href="api-2.6/index.html">current stable release 2.6</a></li>
+<li>The <a href="api-2.5/index.html">previous version 2.5</a></li>
<li>The <a href="api-2.4/index.html">previous version 2.4</a></li>
<li>Older releases - see the <a href="release-history.html">Release History</a> page</li>
</ul>
@@ -65,9 +66,9 @@
(<a href="upgradeto3_0.html">draft changelog</a>) (<a href="article3_0.html">draft upgrade notes</a>). </p>
<p>
-The latest stable version 2.5, is JDK 1.3 compatible -
+The latest stable version 2.6, is JDK 1.3 compatible -
(<a href="http://commons.apache.org/lang/download_lang.cgi">download</a>)
-(<a href="upgradeto2_5.html">changelog</a>) (<a href="article2_5.html">upgrade notes</a>). </p>
+(<a href="upgradeto2_6.html">release notes</a>). </p>
<p>
For information on previous releases, see the <a href="release-history.html">Release History</a> and to download previous releases, see the <a href="http://archive.apache.org/dist/commons/lang/">Apache Archive</a>.
diff --git a/src/site/xdoc/release-history.xml b/src/site/xdoc/release-history.xml
index 08d9632..9e2b7d2 100644
--- a/src/site/xdoc/release-history.xml
+++ b/src/site/xdoc/release-history.xml
@@ -28,6 +28,7 @@
<table>
<tr><th>Version</th><th>Release date</th><th>Javadoc</th><th>Release notes</th></tr>
+<tr><td>2.6</td><td>16/Jan/11</td><td><a href="api-2.6/">api-2.6</a></td><td><a href="upgradeto2_6.html">release notes for 2.6</a></td></tr>
<tr><td>2.5</td><td>23/Feb/10</td><td><a href="api-2.5/">api-2.5</a></td><td><a href="upgradeto2_5.html">release notes for 2.5</a></td></tr>
<tr><td>2.4</td><td>18/Mar/08</td><td><a href="api-2.4/">api-2.4</a></td><td><a href="upgradeto2_4.html">release notes for 2.4</a></td></tr>
<tr><td>2.3</td><td>13/Feb/07</td><td><a href="api-2.3/">api-2.3</a></td><td><a href="upgradeto2_3.html">release notes for 2.3</a></td></tr>
diff --git a/src/site/xdoc/upgradeto2_6.xml b/src/site/xdoc/upgradeto2_6.xml
new file mode 100644
index 0000000..ef32be6
--- /dev/null
+++ b/src/site/xdoc/upgradeto2_6.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<document>
+ <properties>
+ <title>2.6 Release Notes</title>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+<body>
+
+<section name="Lang 2.6 Release Notes">
+<p>
+These are the release notes and advice for upgrading Commons-Lang from
+version 2.5 to version 2.6. <br/><br/>.
+<source>
+INTRODUCTION:
+
+This document contains the release notes for the 2.6 version of Apache Commons Lang.
+Commons Lang is a set of utility functions and reusable components that should be of use in any Java environment.
+
+
+COMPATIBILITY WITH 2.5
+======================
+Lang 2.6 is binary compatible release with Lang 2.5, containing bug fixes and small enhancements.
+
+Lang 2.6 requires a minimum of JDK 1.3.
+
+
+IMPROVEMENTS IN 2.6
+===================
+
+ * [LANG-633] - BooleanUtils: use same optimization in toBooleanObject(String) as in toBoolean(String)
+ * [LANG-599] - ClassUtils: allow Dots as Inner Class Separators in getClass()
+ * [LANG-594] - DateUtils: equal and compare functions up to most significant field
+ * [LANG-632] - DateUtils: provide a Date to Calendar convenience method
+ * [LANG-576] - ObjectUtils: add clone methods to ObjectUtils
+ * [LANG-667] - ObjectUtils: add a Null-safe compare() method
+ * [LANG-670] - ObjectUtils: add notEqual() method
+ * [LANG-302] - StrBuilder: implement clone() method
+ * [LANG-640] - StringUtils: add a normalizeSpace() method
+ * [LANG-614] - StringUtils: add endsWithAny() method
+ * [LANG-655] - StringUtils: add defaultIfBlank() method
+ * [LANG-596] - StrSubstitutor: add a replace(String, Properties) variant
+ * [LANG-482] - StrSubstitutor: support substitution in variable names
+ * [LANG-669] - Use StrBuilder instead of StringBuffer to improve performance where sync. is not an issue
+
+BUG FIXES IN 2.6
+================
+
+ * [LANG-629] - CharSet: make the underlying set synchronized
+ * [LANG-635] - CompareToBuilder: fix passing along compareTransients to the reflectionCompare method
+ * [LANG-636] - ExtendedMessageFormat doesn't override equals(Object)
+ * [LANG-645] - FastDateFormat: fix to properly include the locale when formatting a Date
+ * [LANG-638] - NumberUtils: createNumber() throws a StringIndexOutOfBoundsException when argument containing "e" and "E" is passed in
+ * [LANG-607] - StringUtils methods do not handle Unicode 2.0+ supplementary characters correctly
+ * [LANG-624] - SystemUtils: getJavaVersionAsFloat throws StringIndexOutOfBoundsException on Android runtime/Dalvik VM
+ * [BEANUTILS-381] - MemberUtils: getMatchingAccessibleMethod does not correctly handle inheritance and method overloading
+
+OTHER CHANGES IN 2.6
+====================
+
+ * [LANG-600] - Javadoc is incorrect for lastIndexOf() method
+ * [LANG-628] - Javadoc for HashCodeBuilder.append(boolean) does not match implementation
+ * [LANG-643] - Javadoc StringUtils.left() claims to throw an exception on negative lenth, but doesn't
+ * [LANG-370] - Javadoc - document thread safety
+ * [LANG-623] - Test for StringUtils replaceChars() icelandic characters
+
+</source>
+</p>
+</section>
+
+</body>
+</document>
