From adda54b5211916f9b442e8ac7d82cc861bdde54d Mon Sep 17 00:00:00 2001 From: Pedro Giffuni Date: Wed, 9 May 2012 22:22:11 +0000 Subject: 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 --- .../ExternalProject_apache_commons_httpclient.mk | 2 +- apache-commons/Package_apache_commons_codec.mk | 2 +- apache-commons/Package_apache_commons_lang.mk | 2 +- .../UnpackedTarball_apache_commons_httpclient.mk | 5 + apache-commons/patches/codec.patch | 23 ++-- apache-commons/patches/httpclient.patch | 119 +++++++++++++++++++++ apache-commons/patches/httpclient_no_javadoc.patch | 11 ++ 7 files changed, 151 insertions(+), 13 deletions(-) create mode 100644 apache-commons/patches/httpclient.patch create mode 100644 apache-commons/patches/httpclient_no_javadoc.patch (limited to 'apache-commons') 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 @@ - + -- +- + - +@@ -104,8 +103,7 @@ -- - - - +- +- ++ + + + 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 Mike Bowler + * @author Oleg Kalnichevski +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 Rodney Waldhoff + * @author Sean C. Sullivan + * @author dIon Gillard +- * @author Ortwin Gl?ck ++ * @author Ortwin Glueck + * @author Michael Becke + * @author Mike Bowler + * @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 Mike Bowler + * @author Oleg Kalnichevski + * +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 Remy Maucherat + * @author Rodney Waldhoff + * @author Jeff Dever +- * @author Ortwin Gl?ck ++ * @author Ortwin Glueck + * @author Sean C. Sullivan + * @author Adrian Sutton + * @author Mike Bowler +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 Remy Maucherat + * @author Rodney Waldhoff + * @author Jeff Dever +- * @author Ortwin Gl?ck ++ * @author Ortwin Glueck + * @author Sean C. Sullivan + * @author Adrian Sutton + * @author Mike Bowler +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 Remy Maucherat + * @author Rodney Waldhoff + * @author Jeff Dever +- * @author Ortwin Gl�ck ++ * @author Ortwin Glueck + * @author Sean C. Sullivan + * @author Adrian Sutton + * @author Mike Bowler +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 Remy Maucherat + * @author Rodney Waldhoff + * @author Jeff Dever +- * @author Ortwin Gl???ck ++ * @author Ortwin Glueck + * @author Sean C. Sullivan + * @author Adrian Sutton + * @author Mike Bowler +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 Remy Maucherat + * @author Doug Sale + * @author Jeff Dever +- * @author Ortwin Gl???ck ++ * @author Ortwin Glueck + * @author Mike Bowler + * @author Oleg Kalnichevski + * 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 @@ + + + +- + + -- cgit