Update Apache Commons

Update commons-codec to version 1.6.
Update commons-lang to version 2.4.
Patch common-httpclient to avoid building issues
with OpenJDK-7.

These versions maintain ABI compatibility while
using features from newer Java versions and
have been tested on the FreeBSD port.

Change-Id: I6aec2b6d22fc3335ffbdda9558f475313ef53c85

9 files changed, 155 insertions, 17 deletions

diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/apache-commons/ExternalProject_apache_commons_httpclient.mk
index 5b67c35185ef..aaf1520a6be6 100644
--- a/apache-commons/ExternalProject_apache_commons_httpclient.mk
+++ b/apache-commons/ExternalProject_apache_commons_httpclient.mk
@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) :
 		-f build.xml \
 		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		-Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar" \
-		-Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.3.jar" \
+		-Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/apache-commons/Package_apache_commons_codec.mk b/apache-commons/Package_apache_commons_codec.mk
index aaf3b7f8f9ca..65d302b31357 100644
--- a/apache-commons/Package_apache_commons_codec.mk
+++ b/apache-commons/Package_apache_commons_codec.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,apache_commons_codec_inc,$(call gb_UnpackedTarb
 
 $(eval $(call gb_Package_use_external_project,apache_commons_codec_inc,apache_commons_codec))
 
-$(eval $(call gb_Package_add_file,apache_commons_codec_inc,bin/commons-codec-1.3.jar,dist/commons-codec-1.3.jar))
+$(eval $(call gb_Package_add_file,apache_commons_codec_inc,bin/commons-codec-1.6.jar,dist/commons-codec-1.6-SNAPSHOT.jar))
 
 # vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Package_apache_commons_lang.mk b/apache-commons/Package_apache_commons_lang.mk
index 8f93b9be6878..a9c1eb375d1d 100644
--- a/apache-commons/Package_apache_commons_lang.mk
+++ b/apache-commons/Package_apache_commons_lang.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,apache_commons_lang_inc,$(call gb_UnpackedTarba
 
 $(eval $(call gb_Package_use_external_project,apache_commons_lang_inc,apache_commons_lang))
 
-$(eval $(call gb_Package_add_file,apache_commons_lang_inc,bin/commons-lang-2.3.jar,dist/commons-lang-2.3.jar))
+$(eval $(call gb_Package_add_file,apache_commons_lang_inc,bin/commons-lang-2.4.jar,dist/commons-lang-2.4.jar))
 
 # vim: set noet sw=4 ts=4:
diff --git a/apache-commons/UnpackedTarball_apache_commons_httpclient.mk b/apache-commons/UnpackedTarball_apache_commons_httpclient.mk
index a68c071226f7..6139a94f0d91 100644
--- a/apache-commons/UnpackedTarball_apache_commons_httpclient.mk
+++ b/apache-commons/UnpackedTarball_apache_commons_httpclient.mk
@@ -11,4 +11,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_httpclient))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_httpclient,$(APACHE_COMMONS_HTTPCLIENT_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_httpclient,\
+	apache-commons/patches/httpclient.patch \
+	apache-commons/patches/httpclient_no_javadoc.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/apache-commons/patches/codec.patch b/apache-commons/patches/codec.patch
index ffbcb57c1de8..7a9b4893daf7 100644
--- a/apache-commons/patches/codec.patch
+++ b/apache-commons/patches/codec.patch
@@ -1,17 +1,20 @@
---- misc/build/commons-codec-1.3/build.xml-old	2008-01-31 15:28:58.000000000 +0100
-+++ misc/build/commons-codec-1.3/build.xml	2008-01-31 15:29:21.000000000 +0100
-@@ -90,14 +90,12 @@
+--- misc/build/commons-codec-1.6-src/build.xml-old	2012-05-05 22:12:32.000000000 -0500
++++ misc/build/commons-codec-1.6-src/build.xml	2012-05-05 22:16:00.000000000 -0500
+@@ -96,7 +96,6 @@
      </target>
-     <target name="dist" depends="compile,javadoc" description="Create binary distribution">
+     <target name="dist" depends="compile, javadoc" description="Create binary distribution">
          <mkdir dir="${dist.home}"/>
--        <copy file="../LICENSE" todir="${dist.home}"/>
+-        <copy file="${basedir}/LICENSE.txt" todir="${dist.home}"/>
+         <copy file="${basedir}/NOTICE.txt" todir="${dist.home}"/>
          <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
          <antcall target="jar"/>
-     </target>
+@@ -104,8 +103,7 @@
      <target name="jar" depends="compile" description="Create jar">
          <mkdir dir="${dist.home}"/>
          <mkdir dir="${build.home}/classes/META-INF"/>
--        <copy file="../LICENSE" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-         <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/>
-     </target>
-     <target name="install-jar" depends="jar" description="--> Installs jar file in ${lib.repo}">
+-        <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+-        <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
++        <copy file="${basedir}/NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+         <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes">
+             <manifest>
+                 <attribute name="Specification-Title" value="Commons Codec"/>
diff --git a/apache-commons/patches/httpclient.patch b/apache-commons/patches/httpclient.patch
new file mode 100644
index 000000000000..a64384f9e42a
--- /dev/null
+++ b/apache-commons/patches/httpclient.patch
@@ -0,0 +1,119 @@
+--- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java	2012-05-07 12:37:50.000000000 -0500
+@@ -38,7 +38,7 @@
+ /**
+  * Establishes a tunneled HTTP connection via the CONNECT method.
+  *
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+  * @author dIon Gillard
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
+diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java
+--- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java	2012-05-07 12:37:50.000000000 -0500
+@@ -48,7 +48,7 @@
+  * @author <a href="mailto:rwaldhoff@apache.org">Rodney Waldhoff</a>
+  * @author Sean C. Sullivan
+  * @author <a href="mailto:dion@apache.org">dIon Gillard</a>
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+  * @author <a href="mailto:becke@u.washington.edu">Michael Becke</a>
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+  * @author Sam Maloney
+diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java
+--- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java	2012-05-07 12:37:50.000000000 -0500
+@@ -33,7 +33,7 @@
+ /**
+  * Signals that an error has occurred.
+  * 
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+  * @version $Revision: 480424 $ $Date: 2006-11-29 06:56:49 +0100 (Wed, 29 Nov 2006) $
+  * @since 3.0
+  */
+diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java
+--- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java	2012-05-07 12:37:50.000000000 -0500
+@@ -3,7 +3,7 @@
+ /**
+  * Signals that the response content was larger than anticipated. 
+  * 
+- * @author Ortwin Gl�ck
++ * @author Ortwin Glueck
+  */
+ public class HttpContentTooLargeException extends HttpException {
+     private int maxlen;
+diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java
+--- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java	2012-05-07 12:37:50.000000000 -0500
+@@ -37,7 +37,7 @@
+ /**
+  * Logs all data read to the wire LOG.
+  *
+- * @author Ortwin Gl�ck
++ * @author Ortwin Glueck
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
+  * 
+diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java
+--- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java	2012-05-07 12:37:50.000000000 -0500
+@@ -46,7 +46,7 @@
+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
+  * @author Rodney Waldhoff
+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+  * @author Sean C. Sullivan
+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java
+--- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java	2012-05-07 12:37:50.000000000 -0500
+@@ -67,7 +67,7 @@
+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
+  * @author Rodney Waldhoff
+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+  * @author Sean C. Sullivan
+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java
+--- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java	2012-05-07 12:37:50.000000000 -0500
+@@ -62,7 +62,7 @@
+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
+  * @author Rodney Waldhoff
+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
+- * @author Ortwin Gl�ck
++ * @author Ortwin Glueck
+  * @author Sean C. Sullivan
+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java
+--- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java	2012-05-07 12:37:50.000000000 -0500
+@@ -43,7 +43,7 @@
+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
+  * @author Rodney Waldhoff
+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+  * @author Sean C. Sullivan
+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java
+--- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java	2012-05-07 12:37:50.000000000 -0500
+@@ -62,7 +62,7 @@
+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
+  * @author <a href="mailto:dsale@us.britannica.com">Doug Sale</a>
+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
+  *
diff --git a/apache-commons/patches/httpclient_no_javadoc.patch b/apache-commons/patches/httpclient_no_javadoc.patch
new file mode 100644
index 000000000000..a9bd95de1d17
--- /dev/null
+++ b/apache-commons/patches/httpclient_no_javadoc.patch
@@ -0,0 +1,11 @@
+--- misc/commons-httpclient-3.1/build.xml	2007-08-18 11:02:14.000000000 +0200
++++ misc/build/commons-httpclient-3.1/build.xml	2012-07-09 09:59:21.364830700 +0200
+@@ -142,7 +142,7 @@
+ 
+ <!-- ========== Targets: "External" Targets =============================== -->
+ 
+-  <target name="dist" depends="compile,doc"
++  <target name="dist" depends="compile"
+           description="Create binary distribution">
+     <mkdir dir="${dist.home}"/>
+     <copy file="LICENSE.txt" todir="${dist.home}"/> 
diff --git a/download.lst b/download.lst
index c82ed16193e0..b23dc5bdaa2b 100644
--- a/download.lst
+++ b/download.lst
@@ -8,9 +8,9 @@ VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
 export VISIO_TARBALL := libvisio-0.0.25.tar.bz2
 
 export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
-export APACHE_COMMONS_CODEC_TARBALL := af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
 export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-export APACHE_COMMONS_LANG_TARBALL := 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+export APACHE_COMMONS_LANG_TARBALL := 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
 export APACHE_COMMONS_LOGGING_TARBALL := 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
 export BOOST_TARBALL := f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index 4a1a112ba3c0..adb0b0d59ce5 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -34,9 +34,9 @@ $(eval $(call gb_Extension_use_default_description,wiki-publisher))
 $(eval $(call gb_Extension_use_default_license,wiki-publisher))
 
 ifneq ($(SYSTEM_APACHE_COMMONS),YES)
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.3.jar,$(OUTDIR)/bin/commons-codec-1.3.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.6.jar,$(OUTDIR)/bin/commons-codec-1.6.jar))
 $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar))
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.3.jar,$(OUTDIR)/bin/commons-lang-2.3.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.4.jar,$(OUTDIR)/bin/commons-lang-2.4.jar))
 $(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar))
 endif
 $(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu)))