diff options
| -rw-r--r-- | Makefile.fetch | 3 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 50 | ||||
| -rw-r--r-- | config_host.mk.in | 3 | ||||
| -rw-r--r-- | configure.ac | 91 | ||||
| -rw-r--r-- | download.lst | 9 | ||||
| -rw-r--r-- | external/apache-commons/ExternalProject_apache_commons_codec.mk | 37 | ||||
| -rw-r--r-- | external/apache-commons/ExternalProject_apache_commons_httpclient.mk | 40 | ||||
| -rw-r--r-- | external/apache-commons/ExternalProject_apache_commons_lang.mk | 37 | ||||
| -rw-r--r-- | external/apache-commons/Module_apache-commons.mk | 6 | ||||
| -rw-r--r-- | external/apache-commons/README | 2 | ||||
| -rw-r--r-- | external/apache-commons/UnpackedTarball_apache_commons_codec.mk | 24 | ||||
| -rw-r--r-- | external/apache-commons/UnpackedTarball_apache_commons_httpclient.mk | 19 | ||||
| -rw-r--r-- | external/apache-commons/UnpackedTarball_apache_commons_lang.mk | 20 | ||||
| -rw-r--r-- | external/apache-commons/patches/codec.patch | 20 | ||||
| -rw-r--r-- | external/apache-commons/patches/httpclient.patch | 119 | ||||
| -rw-r--r-- | external/apache-commons/patches/httpclient_no_javadoc.patch | 11 | ||||
| -rw-r--r-- | external/apache-commons/patches/lang.patch | 11 |
17 files changed, 15 insertions, 487 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index db408456b934..659c808bdd9d 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -104,9 +104,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) @date >> $(fetch_LOGFILE) $(foreach item, \ $(call fetch_Optional,ABW,ABW_TARBALL) \ - $(call fetch_Optional,APACHE_COMMONS,APACHE_COMMONS_CODEC_TARBALL) \ - $(call fetch_Optional,APACHE_COMMONS,APACHE_COMMONS_HTTPCLIENT_TARBALL) \ - $(call fetch_Optional,APACHE_COMMONS,APACHE_COMMONS_LANG_TARBALL) \ $(call fetch_Optional,APACHE_COMMONS,APACHE_COMMONS_LOGGING_TARBALL) \ $(call fetch_Optional,APR,APR_TARBALL) \ $(call fetch_Optional,APR,APR_UTIL_TARBALL) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8f988d70cdfa..eb12c36001ec 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3625,21 +3625,6 @@ endif ifneq ($(SYSTEM_APACHE_COMMONS),) -define gb_Jar__use_commons-codec -$(call gb_Jar_use_system_jar,$(1),$(COMMONS_CODEC_JAR)) -endef -gb_ExternalProject__use_commons-codec := - -define gb_Jar__use_commons-httpclient -$(call gb_Jar_use_system_jar,$(1),$(COMMONS_HTTPCLIENT_JAR)) -endef -gb_ExternalProject__use_commons-httpclient := - -define gb_Jar__use_commons-lang -$(call gb_Jar_usadd_linked_libse_system_jar,$(1),$(COMMONS_LANG_JAR)) -endef -gb_ExternalProject__use_commons-lang := - define gb_Jar__use_commons-logging $(call gb_Jar_use_system_jar,$(1),$(COMMONS_LOGGING_JAR)) endef @@ -3652,41 +3637,6 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ commons-logging-$(COMMONS_LOGGING_VERSION) \ )) endif -$(eval $(call gb_Helper_register_jars,OXT,\ - $(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9,commons-codec-1.6) \ - commons-httpclient-3.1 \ - $(if $(filter TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4) \ -)) - -define gb_Jar__use_commons-codec -$(call gb_Jar_use_external_project,$(1),apache_commons_codec) -$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_codec)\ -$(if $(filter TRUE,$(HAVE_JAVA6)),/dist/commons-codec-1.9.jar,/dist/commons-codec-1.6.jar),\ -$(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9.jar,commons-codec-1.6.jar)\ -) -endef -define gb_ExternalProject__use_commons-codec -$(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec) -endef - -define gb_Jar__use_commons-httpclient -$(call gb_Jar_use_external_project,$(1),apache_commons_httpclient) -$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar,commons-httpclient-3.1.jar) -endef -define gb_ExternalProject__use_commons-httpclient -$(call gb_ExternalProject_use_external_project,$(1),apache_commons_httpclient) -endef - -define gb_Jar__use_commons-lang -$(call gb_Jar_use_external_project,$(1),apache_commons_lang) -$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_lang)\ -$(if $(filter TRUE,$(HAVE_JAVA6)),/target/commons-lang3-3.3.1.jar,/dist/commons-lang-2.4.jar),\ -$(if $(filter TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4.jar)\ -) -endef -define gb_ExternalProject__use_commons-lang -$(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang) -endef define gb_Jar__use_commons-logging $(call gb_Jar_use_external_project,$(1),apache_commons_logging) diff --git a/config_host.mk.in b/config_host.mk.in index 5e5851e57da3..698b5cd77a28 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -62,9 +62,6 @@ export CMIS_LIBS=$(gb_SPACE)@CMIS_LIBS@ export COLLADA2GLTF_CFLAGS=$(gb_SPACE)@COLLADA2GLTF_CFLAGS@ export COLLADA2GLTF_LIBS=$(gb_SPACE)@COLLADA2GLTF_LIBS@ export COM=@COM@ -export COMMONS_CODEC_JAR=@COMMONS_CODEC_JAR@ -export COMMONS_HTTPCLIENT_JAR=@COMMONS_HTTPCLIENT_JAR@ -export COMMONS_LANG_JAR=@COMMONS_LANG_JAR@ export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@ export COMMONS_LOGGING_VERSION=@COMMONS_LOGGING_VERSION@ export COMPATH=@COMPATH@ diff --git a/configure.ac b/configure.ac index 8423fb416915..4c00d32bf48e 100644 --- a/configure.ac +++ b/configure.ac @@ -10694,84 +10694,24 @@ AC_SUBST(LIBSERIALIZER_JAR) # this has to be here because both the Wiki Publisher and the SRB use # commons-logging COMMONS_LOGGING_VERSION=1.2 -if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then +if test "$ENABLE_REPORTBUILDER" = "TRUE"; then AC_MSG_CHECKING([which Apache commons-* libs to use]) if test "$with_system_apache_commons" = "yes"; then SYSTEM_APACHE_COMMONS=TRUE AC_MSG_RESULT([external]) - if test "$ENABLE_MEDIAWIKI" = "TRUE"; then - if test -z $COMMONS_CODEC_JAR; then - _commons_codec_path="" - if test "$HAVE_JAVA6" = "TRUE"; then - _commons_codec_path="/usr/share/java/commons-codec-1.9.jar" - else - _commons_codec_path="/usr/share/java/commons-codec-1.6.jar" - fi - AC_CHECK_FILE($_commons_codec_path, - [ COMMONS_CODEC_JAR=$_commons_codec_path ], - [ - AC_CHECK_FILE(/usr/share/java/commons-codec.jar, - [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ], - [AC_MSG_ERROR(commons-codec.jar replacement not found.)] - ) - ] - ) - else - AC_CHECK_FILE($COMMONS_CODEC_JAR, [], - [AC_MSG_ERROR(commons-codec.jar not found.)], []) - fi - - if test -z $COMMONS_LANG_JAR; then - _commons_lang_path="" - if test "$HAVE_JAVA6" = "TRUE"; then - _commons_lang_path="/usr/share/java/commons-lang3-3.3.1-src.tar.gz" - else - _commons_lang_path="/usr/share/java/commons-lang-2.4.jar" - fi - AC_CHECK_FILE($_commons_lang_path, - [ COMMONS_LANG_JAR=$commons_lang_path ], - [ - AC_CHECK_FILE(/usr/share/java/commons-lang.jar, - [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ], - [AC_MSG_ERROR(commons-lang.jar replacement not found.)] - ) - ] - ) - else - AC_CHECK_FILE($COMMONS_LANG_JAR, [], - [AC_MSG_ERROR(commons-lang.jar not found.)], []) - fi - - if test -z $COMMONS_HTTPCLIENT_JAR; then - AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar, - [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ], - [ - AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar, - [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ], - [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)] - ) - ] - ) - else - AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [], - [AC_MSG_ERROR(commons-httpclient.jar not found.)], []) - fi - fi - if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then - if test -z $COMMONS_LOGGING_JAR; then - AC_CHECK_FILE(/usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar, - [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar ], - [ - AC_CHECK_FILE(/usr/share/java/commons-logging.jar, - [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ], - [AC_MSG_ERROR(commons-logging.jar replacement not found.)] - ) - ] - ) - else - AC_CHECK_FILE($COMMONS_LOGGING_JAR, [], - [AC_MSG_ERROR(commons-logging.jar not found.)], []) - fi + if test -z $COMMONS_LOGGING_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar, + [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-logging.jar, + [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ], + [AC_MSG_ERROR(commons-logging.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_LOGGING_JAR, [], + [AC_MSG_ERROR(commons-logging.jar not found.)], []) fi else AC_MSG_RESULT([internal]) @@ -10780,9 +10720,6 @@ if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then fi fi AC_SUBST(SYSTEM_APACHE_COMMONS) -AC_SUBST(COMMONS_CODEC_JAR) -AC_SUBST(COMMONS_LANG_JAR) -AC_SUBST(COMMONS_HTTPCLIENT_JAR) AC_SUBST(COMMONS_LOGGING_JAR) AC_SUBST(COMMONS_LOGGING_VERSION) diff --git a/download.lst b/download.lst index 784cf865c63a..38e774098aed 100644 --- a/download.lst +++ b/download.lst @@ -1,14 +1,5 @@ export ABW_MD5SUM := 7a3815b506d064313ba309617b6f5a0b export ABW_TARBALL := libabw-0.1.1.tar.bz2 -export APACHE_COMMONS_CODEC_TARBALL := $(if $(filter TRUE,$(HAVE_JAVA6))\ - ,048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip\ - ,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 := $(if $(filter TRUE,$(HAVE_JAVA6))\ - ,8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz\ - ,625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz\ -) export APACHE_COMMONS_LOGGING_MD5SUM := ce977548f1cbf46918e93cd38ac35163 export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz export APR_MD5SUM := eff9d741b0999a9bbab96862dd2a2a3d diff --git a/external/apache-commons/ExternalProject_apache_commons_codec.mk b/external/apache-commons/ExternalProject_apache_commons_codec.mk deleted file mode 100644 index aedda046febe..000000000000 --- a/external/apache-commons/ExternalProject_apache_commons_codec.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_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 \ - ,$(if $(filter TRUE,$(HAVE_JAVA6)) \ - ,-Dcompile.source=1.6 -Dcompile.target=1.6 \ - ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) \ - ) \ - ) \ - $(if $(filter TRUE,$(HAVE_JAVA6)) \ - ,$(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \ - ,$(if $(debug),-Dbuild.debug="on") \ - ) \ - jar \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk deleted file mode 100644 index c2cec42dff86..000000000000 --- a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk +++ /dev/null @@ -1,40 +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-$(COMMONS_LOGGING_VERSION).jar" \ - $(if $(filter TRUE,$(HAVE_JAVA6))\ - ,-Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.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/external/apache-commons/ExternalProject_apache_commons_lang.mk b/external/apache-commons/ExternalProject_apache_commons_lang.mk deleted file mode 100644 index c180a8970693..000000000000 --- a/external/apache-commons/ExternalProject_apache_commons_lang.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_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 \ - ,$(if $(filter TRUE,$(HAVE_JAVA6)) \ - ,-Dcompile.source=1.6 -Dcompile.target=1.6 \ - ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) \ - ) \ - ) \ - $(if $(filter TRUE,$(HAVE_JAVA6)) \ - ,$(if $(debug),-Dcompile.debug="true") \ - ,$(if $(debug),-Dbuild.debug="on") \ - ) \ - jar \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/external/apache-commons/Module_apache-commons.mk b/external/apache-commons/Module_apache-commons.mk index 1dcac4da4c4d..45aabe229b03 100644 --- a/external/apache-commons/Module_apache-commons.mk +++ b/external/apache-commons/Module_apache-commons.mk @@ -11,13 +11,7 @@ $(eval $(call gb_Module_Module,apache-commons)) $(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 \ - UnpackedTarball_apache_commons_codec \ - UnpackedTarball_apache_commons_httpclient \ - UnpackedTarball_apache_commons_lang \ UnpackedTarball_apache_commons_logging \ )) diff --git a/external/apache-commons/README b/external/apache-commons/README index 0ab7b63d1ea8..18944aca4af7 100644 --- a/external/apache-commons/README +++ b/external/apache-commons/README @@ -1 +1 @@ -Java libraries; used for logging and http/https access in Extensions, from [http://commons.apache.org/] +Java library; used for logging in Extensions, from [http://commons.apache.org/] diff --git a/external/apache-commons/UnpackedTarball_apache_commons_codec.mk b/external/apache-commons/UnpackedTarball_apache_commons_codec.mk deleted file mode 100644 index 5e55c1f84669..000000000000 --- a/external/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,\ - external/apache-commons/patches/codec.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/apache-commons/UnpackedTarball_apache_commons_httpclient.mk b/external/apache-commons/UnpackedTarball_apache_commons_httpclient.mk deleted file mode 100644 index 23d995f2d103..000000000000 --- a/external/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,\ - external/apache-commons/patches/httpclient.patch \ - external/apache-commons/patches/httpclient_no_javadoc.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/apache-commons/UnpackedTarball_apache_commons_lang.mk b/external/apache-commons/UnpackedTarball_apache_commons_lang.mk deleted file mode 100644 index 7d227acbde78..000000000000 --- a/external/apache-commons/UnpackedTarball_apache_commons_lang.mk +++ /dev/null @@ -1,20 +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)) - -$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_lang,\ - $(if $(filter TRUE,$(HAVE_JAVA6)) \ - ,external/apache-commons/patches/lang.patch \ - ) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/apache-commons/patches/codec.patch b/external/apache-commons/patches/codec.patch deleted file mode 100644 index 7a9b4893daf7..000000000000 --- a/external/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/external/apache-commons/patches/httpclient.patch b/external/apache-commons/patches/httpclient.patch deleted file mode 100644 index a64384f9e42a..000000000000 --- a/external/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 Glck -+ * @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/external/apache-commons/patches/httpclient_no_javadoc.patch b/external/apache-commons/patches/httpclient_no_javadoc.patch deleted file mode 100644 index a9bd95de1d17..000000000000 --- a/external/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/external/apache-commons/patches/lang.patch b/external/apache-commons/patches/lang.patch deleted file mode 100644 index 3e5d442659b8..000000000000 --- a/external/apache-commons/patches/lang.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/commons-lang3-src/default.properties 2014-03-15 13:47:48.000000000 +0100 -+++ misc/build/commons-lang3-src/default.properties 2014-10-30 17:57:53.000000000 +0100 -@@ -60,7 +60,7 @@ - test.home = src/test/java - - # Should Java compilations set the 'debug' compiler option? --compile.debug = true -+compile.debug = false - - # Should Java compilations set the 'deprecation' compiler option? - compile.deprecation = true |