[Libreoffice-commits] core.git: configure.ac download.lst external/apache-commons external/jfreereport reportbuilder/java RepositoryExternal.mk swext/Extension_wiki-publisher.mk
Thomas Arnhold
thomas at arnhold.org
Sat Aug 16 19:56:57 PDT 2014
RepositoryExternal.mk | 4 ++--
configure.ac | 4 ++--
download.lst | 3 ++-
external/apache-commons/ExternalPackage_apache_commons_logging.mk | 2 +-
external/apache-commons/ExternalProject_apache_commons_httpclient.mk | 2 +-
external/apache-commons/patches/logging.patch | 8 ++++----
external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 2 +-
reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf | 2 +-
swext/Extension_wiki-publisher.mk | 2 +-
10 files changed, 16 insertions(+), 15 deletions(-)
New commits:
commit 439354a0b4641bc2ee8e403e8b9e84ac4a0ec6a9
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Aug 14 23:20:27 2014 +0200
upgrade to apache-commons-1.2
Change-Id: Ic356c6a23f42b5fe37be1075e8508bb168eac9a1
Reviewed-on: https://gerrit.libreoffice.org/10927
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 621ff41..16772512 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3512,7 +3512,7 @@ else # !SYSTEM_APACHE_COMMONS
ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
- commons-logging-1.1.3 \
+ commons-logging-1.2 \
))
endif
$(eval $(call gb_Helper_register_jars,OXT,\
@@ -3553,7 +3553,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.3)
+$(call gb_Jar_use_jar,$(1),commons-logging-1.2)
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 b5d7373..1189229 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10930,8 +10930,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.3.jar,
- [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.3.jar ],
+ AC_CHECK_FILE(/usr/share/java/commons-logging-1.2.jar,
+ [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.2.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 9eb59ac..bd66376 100644
--- a/download.lst
+++ b/download.lst
@@ -9,7 +9,8 @@ export APACHE_COMMONS_LANG_TARBALL := $(if $(filter TRUE,$(HAVE_JAVA6))\
,8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz\
,625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz\
)
-export APACHE_COMMONS_LOGGING_TARBALL := e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
+export APACHE_COMMONS_LOGGING_MD5SUM := ce977548f1cbf46918e93cd38ac35163
+export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
export APR_MD5SUM := eff9d741b0999a9bbab96862dd2a2a3d
export APR_TARBALL := apr-1.4.8.tar.gz
export APR_UTIL_MD5SUM := 71a11d037240b292f824ba1eb537b4e3
diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
index b89a394..ce72112 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 f8cec74..ff2733a 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 9514aae..953cf61 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"/>
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index 6dcc419..9245ae1 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.3.jar") \
+ -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.2.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 7c278d1..38e4f9f 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.3.jar") \
+ -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.2.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 48088a6..23731b1 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.3.jar
+ flow-engine.jar sac.jar commons-logging-1.2.jar
UNO-Type-Path:
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index 3ed270e..1c52b43 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(
$(eval $(call gb_Extension_add_file,wiki-publisher,$(if $(filter TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4.jar),\
$(call gb_UnpackedTarball_get_dir,apache_commons_lang)$(if $(filter TRUE,$(HAVE_JAVA6)),/target/commons-lang3-3.3.1.jar,/dist/commons-lang-2.4.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))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.2.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.2.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))
More information about the Libreoffice-commits
mailing list