fdo#70393: move apache-commons to a subdir of external

Change-Id: I97f27f1fd53e416767c7aa3478deb23aae0427e0
Reviewed-on: https://gerrit.libreoffice.org/6281
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

19 files changed, 0 insertions, 491 deletions

diff --git a/apache-commons/ExternalPackage_apache_commons_logging.mk b/apache-commons/ExternalPackage_apache_commons_logging.mk
deleted file mode 100644
index 41cd2c6d41c2..000000000000
--- a/apache-commons/ExternalPackage_apache_commons_logging.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging_inc,apache_commons_logging))
-
-$(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging_inc,apache_commons_logging))
-
-$(eval $(call gb_ExternalPackage_add_jar_for_install,apache_commons_logging_inc,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/apache-commons/ExternalProject_apache_commons_codec.mk
deleted file mode 100644
index 2135cb4c70d2..000000000000
--- a/apache-commons/ExternalProject_apache_commons_codec.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec))
-
-$(eval $(call gb_ExternalProject_register_targets,apache_commons_codec,\
-	build \
-))
-
-$(call gb_ExternalProject_get_state_target,apache_commons_codec,build) :
-	$(call gb_ExternalProject_run,build,\
-	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		$(if $(debug),-Dbuild.debug="on") \
-		jar \
-	)
-
-# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/apache-commons/ExternalProject_apache_commons_httpclient.mk
deleted file mode 100644
index 4c02459c207d..000000000000
--- a/apache-commons/ExternalProject_apache_commons_httpclient.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient))
-
-$(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-codec))
-$(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-logging))
-
-$(eval $(call gb_ExternalProject_register_targets,apache_commons_httpclient,\
-	build \
-))
-
-$(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) :
-	$(call gb_ExternalProject_run,build,\
-	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-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.6-SNAPSHOT.jar" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		$(if $(debug),-Dbuild.debug="on") \
-		dist \
-	)
-
-# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/ExternalProject_apache_commons_lang.mk b/apache-commons/ExternalProject_apache_commons_lang.mk
deleted file mode 100644
index aadd73312bfb..000000000000
--- a/apache-commons/ExternalProject_apache_commons_lang.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang))
-
-$(eval $(call gb_ExternalProject_register_targets,apache_commons_lang,\
-	build \
-))
-
-$(call gb_ExternalProject_get_state_target,apache_commons_lang,build) :
-	$(call gb_ExternalProject_run,build,\
-	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		$(if $(debug),-Dbuild.debug="on") \
-		jar \
-	)
-
-# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk b/apache-commons/ExternalProject_apache_commons_logging.mk
deleted file mode 100644
index 98a77eb7ab45..000000000000
--- a/apache-commons/ExternalProject_apache_commons_logging.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging))
-
-# TODO: this should go into RepositoryExternal.mk
-ifneq ($(SYSTEM_TOMCAT),YES)
-$(eval $(call gb_ExternalProject_use_packages,apache_commons_logging,\
-	tomcat_inc \
-))
-endif
-
-$(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\
-	build \
-))
-
-$(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
-	$(call gb_ExternalProject_run,build,\
-	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter YES,$(SYSTEM_TOMCAT))\
-			,-Dservletapi.jar=$(SERVLETAPI_JAR) \
-			,-Dservletapi.jar=$(SOLARVER)/$(INPATH)/bin/servlet-api.jar \
-		)\
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		$(if $(debug),-Dbuild.debug="on") \
-		compile build-jar \
-	)
-
-# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Makefile b/apache-commons/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/apache-commons/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Module_apache-commons.mk b/apache-commons/Module_apache-commons.mk
deleted file mode 100644
index 0361597bd7e4..000000000000
--- a/apache-commons/Module_apache-commons.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,apache-commons))
-
-ifneq ($(ENABLE_JAVA),)
-ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),)
-$(eval $(call gb_Module_add_targets,apache-commons,\
-	ExternalPackage_apache_commons_logging \
-	ExternalProject_apache_commons_codec \
-	ExternalProject_apache_commons_httpclient \
-	ExternalProject_apache_commons_lang \
-	ExternalProject_apache_commons_logging \
-	Package_apache_commons_codec \
-	Package_apache_commons_httpclient \
-	Package_apache_commons_lang \
-	UnpackedTarball_apache_commons_codec \
-	UnpackedTarball_apache_commons_httpclient \
-	UnpackedTarball_apache_commons_lang \
-	UnpackedTarball_apache_commons_logging \
-))
-endif
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Package_apache_commons_codec.mk b/apache-commons/Package_apache_commons_codec.mk
deleted file mode 100644
index 65d302b31357..000000000000
--- a/apache-commons/Package_apache_commons_codec.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,apache_commons_codec_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_codec)))
-
-$(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.6.jar,dist/commons-codec-1.6-SNAPSHOT.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Package_apache_commons_httpclient.mk b/apache-commons/Package_apache_commons_httpclient.mk
deleted file mode 100644
index dd21d777a97e..000000000000
--- a/apache-commons/Package_apache_commons_httpclient.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,apache_commons_httpclient_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)))
-
-$(eval $(call gb_Package_use_external_project,apache_commons_httpclient_inc,apache_commons_httpclient))
-
-$(eval $(call gb_Package_add_file,apache_commons_httpclient_inc,bin/commons-httpclient-3.1.jar,dist/commons-httpclient.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
deleted file mode 100644
index a9c1eb375d1d..000000000000
--- a/apache-commons/Package_apache_commons_lang.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,apache_commons_lang_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_lang)))
-
-$(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.4.jar,dist/commons-lang-2.4.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/README b/apache-commons/README
deleted file mode 100644
index 0ab7b63d1ea8..000000000000
--- a/apache-commons/README
+++ /dev/null
@@ -1 +0,0 @@
-Java libraries; used for logging and http/https access in Extensions, from [http://commons.apache.org/]
diff --git a/apache-commons/UnpackedTarball_apache_commons_codec.mk b/apache-commons/UnpackedTarball_apache_commons_codec.mk
deleted file mode 100644
index 64a29e31b281..000000000000
--- a/apache-commons/UnpackedTarball_apache_commons_codec.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_codec))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_codec,$(APACHE_COMMONS_CODEC_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_set_patchlevel,apache_commons_codec,3))
-
-$(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_codec,\
-        build.xml \
-))
-
-$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_codec,\
-	apache-commons/patches/codec.patch \
-))
-
-# 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
deleted file mode 100644
index c5279e8161ef..000000000000
--- a/apache-commons/UnpackedTarball_apache_commons_httpclient.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_httpclient))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_httpclient,$(APACHE_COMMONS_HTTPCLIENT_TARBALL),,apache-commons))
-
-$(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/UnpackedTarball_apache_commons_lang.mk b/apache-commons/UnpackedTarball_apache_commons_lang.mk
deleted file mode 100644
index 9b9f077b5fea..000000000000
--- a/apache-commons/UnpackedTarball_apache_commons_lang.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_lang))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_lang,$(APACHE_COMMONS_LANG_TARBALL),,apache-commons))
-
-# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/UnpackedTarball_apache_commons_logging.mk b/apache-commons/UnpackedTarball_apache_commons_logging.mk
deleted file mode 100644
index 8d725ff7c4d4..000000000000
--- a/apache-commons/UnpackedTarball_apache_commons_logging.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_logging))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_logging,$(APACHE_COMMONS_LOGGING_TARBALL),,apache-commons))
-
-$(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_logging,\
-	build.xml \
-))
-
-$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_logging,\
-	apache-commons/patches/logging.patch \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/patches/codec.patch b/apache-commons/patches/codec.patch
deleted file mode 100644
index 7a9b4893daf7..000000000000
--- a/apache-commons/patches/codec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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">
-         <mkdir dir="${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"/>
-@@ -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="${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
deleted file mode 100644
index a64384f9e42a..000000000000
--- a/apache-commons/patches/httpclient.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- 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
deleted file mode 100644
index a9bd95de1d17..000000000000
--- a/apache-commons/patches/httpclient_no_javadoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/apache-commons/patches/logging.patch b/apache-commons/patches/logging.patch
deleted file mode 100644
index f96eda38075c..000000000000
--- a/apache-commons/patches/logging.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- misc/commons-logging-1.1.1-src/build.xml	2007-11-22 00:27:52.000000000 +0100
-+++ misc/build/commons-logging-1.1.1-src/build.xml	2008-06-24 14:23:56.316301736 +0200
-@@ -127,10 +127,10 @@
- <!-- ========== Compiler Defaults ========================================= -->
- 
-   <!-- Version of java class files to generate. -->
--  <property name="target.version" value="1.1"/>
-+  <property name="target.version" value="1.5"/>
- 
-   <!-- Version of java source to accept -->
--  <property name="source.version" value="1.2"/>
-+  <property name="source.version" value="1.3"/>
- 
-   <!-- Should Java compilations set the 'debug' compiler option? -->
-   <property name="compile.debug"           value="true"/>