diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-14 23:20:27 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-16 21:56:35 -0500 |
| commit | 439354a0b4641bc2ee8e403e8b9e84ac4a0ec6a9 (patch) | |
| tree | 3fd7f4eaf9cbf06d105b86dbd2a58eb23dc157dc /external/apache-commons | |
| parent | Fix another: reference to 'Primitive2DSequence' is ambiguous (diff) | |
| download | core-439354a0b4641bc2ee8e403e8b9e84ac4a0ec6a9.tar.gz core-439354a0b4641bc2ee8e403e8b9e84ac4a0ec6a9.zip | |
upgrade to apache-commons-1.2
Change-Id: Ic356c6a23f42b5fe37be1075e8508bb168eac9a1
Reviewed-on: https://gerrit.libreoffice.org/10927
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'external/apache-commons')
3 files changed, 6 insertions, 6 deletions
diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk index b89a3945f85a..ce721129afea 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.3.jar,target/commons-logging-1.1.3.jar)) +$(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.2.jar,target/commons-logging-1.2.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 f8cec7429775..ff2733ab364d 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.3.jar" \ + -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.2.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" \ diff --git a/external/apache-commons/patches/logging.patch b/external/apache-commons/patches/logging.patch index 9514aaed6f6e..953cf614768d 100644 --- a/external/apache-commons/patches/logging.patch +++ b/external/apache-commons/patches/logging.patch @@ -1,10 +1,10 @@ --- misc/commons-logging-1.1.1-src/build.xml 2007-11-22 00:27:52.000000000 +0100 +++ misc/build/commons-logging-1.1.1-src/build.xml 2008-06-24 14:23:56.316301736 +0200 -@@ -127,10 +127,10 @@ +@@ -130,10 +130,10 @@ <!-- ========== Compiler Defaults ========================================= --> <!-- Version of java class files to generate. --> -- <property name="target.version" value="1.1"/> +- <property name="target.version" value="1.2"/> + <property name="target.version" value="1.5"/> <!-- Version of java source to accept --> @@ -13,7 +13,7 @@ <!-- Should Java compilations set the 'debug' compiler option? --> <property name="compile.debug" value="true"/> -@@ -280,6 +280,10 @@ +@@ -283,6 +283,10 @@ classpathref="compile.classpath" classname="org.apache.avalon.framework.logger.Logger"/> @@ -24,7 +24,7 @@ <available file="${log4j12.jar}" property="log4j12.present"/> <available file="${log4j13.jar}" property="log4j13.present"/> <available file="${build.home}/docs" property="maven.generated.docs.present"/> -@@ -370,6 +374,8 @@ +@@ -373,6 +377,8 @@ unless="logkit.present"/> <exclude name="org/apache/commons/logging/impl/AvalonLogger.java" unless="avalon-framework.present"/> |