Kaydet (Commit) 3dad9b10 authored tarafından Caolán McNamara's avatar Caolán McNamara

bump apache-commons-codec to 1.9

Change-Id: Ia5638f4c4cc47121610b8ddff144fb88aff6b96f
üst 2b15c85a
...@@ -3169,14 +3169,14 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ ...@@ -3169,14 +3169,14 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
commons-logging-1.1.3 \ commons-logging-1.1.3 \
)) ))
$(eval $(call gb_Helper_register_jars,OXT,\ $(eval $(call gb_Helper_register_jars,OXT,\
commons-codec-1.6 \ commons-codec-1.9 \
commons-httpclient-3.1 \ commons-httpclient-3.1 \
commons-lang-2.4 \ commons-lang-2.4 \
)) ))
define gb_Jar__use_commons-codec define gb_Jar__use_commons-codec
$(call gb_Jar_use_external_project,$(1),apache_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 endef
define gb_ExternalProject__use_commons-codec define gb_ExternalProject__use_commons-codec
$(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec) $(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec)
......
...@@ -10591,8 +10591,8 @@ if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then ...@@ -10591,8 +10591,8 @@ if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
if test "$ENABLE_MEDIAWIKI" = "TRUE"; then if test "$ENABLE_MEDIAWIKI" = "TRUE"; then
if test -z $COMMONS_CODEC_JAR; then if test -z $COMMONS_CODEC_JAR; then
AC_CHECK_FILE(/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.6.jar ], [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.9.jar ],
[ [
AC_CHECK_FILE(/usr/share/java/commons-codec.jar, AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
[ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ], [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
......
...@@ -37,7 +37,7 @@ export LIBEOT_TARBALL := libeot-0.01.tar.bz2 ...@@ -37,7 +37,7 @@ export LIBEOT_TARBALL := libeot-0.01.tar.bz2
SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b
export SERF_TARBALL := serf-1.2.1.tar.bz2 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_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_LANG_TARBALL := 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
export APACHE_COMMONS_LOGGING_TARBALL := e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz export APACHE_COMMONS_LOGGING_TARBALL := e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
......
...@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) : ...@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) :
-f build.xml \ -f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -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-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))\ $(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \ ,-Dbuild.compiler=gcj \
,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
......
...@@ -22,7 +22,7 @@ $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_co ...@@ -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_httpclient))
$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_lang)) $(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-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-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)) $(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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment