summaryrefslogtreecommitdiffstats
path: root/external/apache-commons
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-25 09:31:52 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-25 13:06:34 +0000
commit2b15c85a8cd83e71ca344fa90357f845aaf29f1b (patch)
treef73a9609f5aedd6deb03a454577307fd119e2642 /external/apache-commons
parentWaE: unused variable 'catst2' [loplugin:unusedvariablecheck] (diff)
downloadcore-2b15c85a8cd83e71ca344fa90357f845aaf29f1b.tar.gz
core-2b15c85a8cd83e71ca344fa90357f845aaf29f1b.zip
bump apache-commons-logging to 1.1.3
Change-Id: Ibeebcc8616a3547f2e2dbf4d613ce4c02ba9d176
Diffstat (limited to 'external/apache-commons')
-rw-r--r--external/apache-commons/ExternalPackage_apache_commons_logging.mk2
-rw-r--r--external/apache-commons/ExternalProject_apache_commons_httpclient.mk2
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 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 \