summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-25 09:52:39 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-25 13:06:34 +0000
commit1731f6e692bb0a07a2bca4b1b190163f209d2b9e (patch)
tree33fff9b577444fa6038a4cf1f6e76832ff878503
parent3dad9b1019bebcc6db63a424afa146e007f768d2 (diff)
bump apache-commons-lang to 3.3.1
Change-Id: Ibae9d3d143e111c0bb60de76deb085a3ccb010c9
-rw-r--r--RepositoryExternal.mk4
-rw-r--r--configure.ac4
-rw-r--r--download.lst2
-rw-r--r--swext/Extension_wiki-publisher.mk2
4 files changed, 6 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 705088fd4048..0a70e2675062 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3171,7 +3171,7 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
$(eval $(call gb_Helper_register_jars,OXT,\
commons-codec-1.9 \
commons-httpclient-3.1 \
- commons-lang-2.4 \
+ commons-lang3-3.3.1.jar \
))
define gb_Jar__use_commons-codec
@@ -3192,7 +3192,7 @@ 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)/dist/commons-lang-2.4.jar,commons-lang-2.4.jar)
+$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/target/commons-lang3-3.3.1.jar,commons-lang3-3.3.1.jar)
endef
define gb_ExternalProject__use_commons-lang
$(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang)
diff --git a/configure.ac b/configure.ac
index 68f137085b06..07b2d248f04d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10606,8 +10606,8 @@ if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then
fi
if test -z $COMMONS_LANG_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-lang-2.4.jar,
- [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.4.jar ],
+ AC_CHECK_FILE(/usr/share/java/commons-lang3-3.3.1-src.tar.gz,
+ [ COMMONS_LANG_JAR=/usr/share/java/commons-lang3-3.3.1-src.tar.gz ],
[
AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
[ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
diff --git a/download.lst b/download.lst
index 81a2533b9516..733f4c7a8f31 100644
--- a/download.lst
+++ b/download.lst
@@ -39,7 +39,7 @@ export SERF_TARBALL := serf-1.2.1.tar.bz2
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_LANG_TARBALL := 8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
export APACHE_COMMONS_LOGGING_TARBALL := e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
export BOOST_TARBALL := d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index e0d894629026..efc0113e2339 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_la
$(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-lang3-3.3.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/target/commons-lang3-3.3.1.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))
endif
$(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu)))