diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | download.lst | 2 | ||||
| -rw-r--r-- | external/apache-commons/ExternalProject_apache_commons_httpclient.mk | 2 | ||||
| -rw-r--r-- | swext/Extension_wiki-publisher.mk | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 791e52b62733..705088fd4048 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3169,14 +3169,14 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ commons-logging-1.1.3 \ )) $(eval $(call gb_Helper_register_jars,OXT,\ - commons-codec-1.6 \ + commons-codec-1.9 \ commons-httpclient-3.1 \ 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)/dist/commons-codec-1.6-SNAPSHOT.jar,commons-codec-1.6.jar) +$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.jar,commons-codec-1.9.jar) endef define gb_ExternalProject__use_commons-codec $(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec) diff --git a/configure.ac b/configure.ac index 1158b962dfb8..68f137085b06 100644 --- a/configure.ac +++ b/configure.ac @@ -10591,8 +10591,8 @@ if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then AC_MSG_RESULT([external]) if test "$ENABLE_MEDIAWIKI" = "TRUE"; then if test -z $COMMONS_CODEC_JAR; then - AC_CHECK_FILE(/usr/share/java/commons-codec-1.6.jar, - [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.6.jar ], + AC_CHECK_FILE(/usr/share/java/commons-codec-1.9.jar, + [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.9.jar ], [ AC_CHECK_FILE(/usr/share/java/commons-codec.jar, [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ], diff --git a/download.lst b/download.lst index 2bc7091841c3..81a2533b9516 100644 --- a/download.lst +++ b/download.lst @@ -37,7 +37,7 @@ export LIBEOT_TARBALL := libeot-0.01.tar.bz2 SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b export SERF_TARBALL := serf-1.2.1.tar.bz2 -export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz +export APACHE_COMMONS_CODEC_TARBALL := 048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz export APACHE_COMMONS_LANG_TARBALL := 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz export APACHE_COMMONS_LOGGING_TARBALL := e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz diff --git a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk index 6da49b359337..92e60dea5284 100644 --- a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk +++ b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk @@ -24,7 +24,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.3.jar" \ - -Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar" \ + -Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.jar" \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 7835f0ba840a..e0d894629026 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_co $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_httpclient)) $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_lang)) -$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.6.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar)) +$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.9.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.4.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/dist/commons-lang-2.4.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.3.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.3.jar)) |