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/ExternalPackage_apache_commons_logging.mk | 2 | ||||
| -rw-r--r-- | external/apache-commons/ExternalProject_apache_commons_httpclient.mk | 2 | ||||
| -rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 2 | ||||
| -rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 2 | ||||
| -rw-r--r-- | reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf | 2 | ||||
| -rw-r--r-- | swext/Extension_wiki-publisher.mk | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 809a1103874e..791e52b62733 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3166,7 +3166,7 @@ gb_ExternalProject__use_commons-logging := else # !SYSTEM_APACHE_COMMONS $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ - commons-logging-1.1.1 \ + commons-logging-1.1.3 \ )) $(eval $(call gb_Helper_register_jars,OXT,\ commons-codec-1.6 \ @@ -3200,7 +3200,7 @@ endef define gb_Jar__use_commons-logging $(call gb_Jar_use_external_project,$(1),apache_commons_logging) -$(call gb_Jar_use_jar,$(1),commons-logging-1.1.1) +$(call gb_Jar_use_jar,$(1),commons-logging-1.1.3) endef define gb_ExternalProject__use_commons-logging $(call gb_ExternalProject_use_external_project,$(1),apache_commons_logging) diff --git a/configure.ac b/configure.ac index 016bb166b553..1158b962dfb8 100644 --- a/configure.ac +++ b/configure.ac @@ -10637,8 +10637,8 @@ if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then 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-1.1.1.jar, - [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ], + AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.3.jar, + [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.3.jar ], [ AC_CHECK_FILE(/usr/share/java/commons-logging.jar, [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ], diff --git a/download.lst b/download.lst index 5de30f10864b..2bc7091841c3 100644 --- a/download.lst +++ b/download.lst @@ -40,7 +40,7 @@ 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_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 := 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.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 export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk index 5a37df27d90b..b89a3945f85a 100644 --- a/external/apache-commons/ExternalPackage_apache_commons_logging.mk +++ b/external/apache-commons/ExternalPackage_apache_commons_logging.mk @@ -11,6 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging,apache_c $(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging,apache_commons_logging)) -$(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar)) +$(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.3.jar,target/commons-logging-1.1.3.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 index 4c02459c207d..6da49b359337 100644 --- a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk +++ b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk @@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) : -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-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" \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index d2efb32b5f80..6dcc4193441f 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ $(if $(SYSTEM_APACHE_COMMONS),\ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ - -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar") \ + -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.3.jar") \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ -Dliblayout.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)/build/lib/liblayout.jar \ diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk index 861d25a276b7..7c278d149710 100644 --- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ $(if $(SYSTEM_APACHE_COMMONS),\ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ - -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar") \ + -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.3.jar") \ -Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf index 502de48a3eaa..48088a6da554 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf +++ b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf @@ -3,5 +3,5 @@ Class-Path: reportbuilderwizard.jar flute-1.1.6.jar libserializer-1.1.6.jar libbase-1.1.6.jar libfonts-1.1.6.jar libformula-1.1.7.jar liblayout.jar libloader-1.1.6.jar librepository-1.1.6.jar libxml-1.1.7.jar - flow-engine.jar sac.jar commons-logging-1.1.1.jar + flow-engine.jar sac.jar commons-logging-1.1.3.jar UNO-Type-Path: diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 6656442eac0e..7835f0ba840a 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_la $(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-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.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.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))) $(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu)) |