diff options
| author | rbuj <robert.buj@gmail.com> | 2014-08-18 13:52:32 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-20 07:29:55 -0500 |
| commit | d8a7f72bab1745cbf122400d81380ed66a6c36fc (patch) | |
| tree | 81551cbe01456f53fb9de23b75762ff192281fe1 /external/apache-commons | |
| parent | 1b0baa5799a56432d45cb1ec63d77ab93a3ebf9a (diff) | |
Use COMMONS_LOGGING_VERSION vble
Change-Id: I0c76ec7e3f9b95166b4005dd1ad5349b3889c3e4
Reviewed-on: https://gerrit.libreoffice.org/10993
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'external/apache-commons')
| -rw-r--r-- | external/apache-commons/ExternalPackage_apache_commons_logging.mk | 2 | ||||
| -rw-r--r-- | external/apache-commons/ExternalProject_apache_commons_httpclient.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk index ce721129afea..2bff13b93c66 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.2.jar,target/commons-logging-1.2.jar)) +$(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-$(COMMONS_LOGGING_VERSION).jar,target/commons-logging-$(COMMONS_LOGGING_VERSION).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 ff2733ab364d..c2cec42dff86 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.2.jar" \ + -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" \ |