[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 7 commits - apache-commons/java apache-commons/patches apache-commons/prj configure.in external_deps.lst rat-excludes reportbuilder/java reportbuilder/util swext/mediawiki
Jürgen Schmidt
jsc at apache.org
Mon Mar 24 11:08:21 PDT 2014
apache-commons/java/codec/makefile.mk | 17 -
apache-commons/java/httpclient/makefile.mk | 4
apache-commons/java/lang/makefile.mk | 14 -
apache-commons/java/logging/makefile.mk | 14 -
apache-commons/patches/codec.patch | 36 +--
apache-commons/patches/httpclient.patch | 151 ++-----------
apache-commons/patches/logging.patch | 6
apache-commons/prj/d.lst | 6
configure.in | 14 -
external_deps.lst | 30 +-
rat-excludes | 16 +
reportbuilder/java/com/sun/star/report/makefile.mk | 2
reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf | 2
reportbuilder/java/com/sun/star/report/pentaho/makefile.mk | 12 -
reportbuilder/util/makefile.mk | 4
swext/mediawiki/build.xml | 2
swext/mediawiki/makefile.mk | 6
17 files changed, 137 insertions(+), 199 deletions(-)
New commits:
commit 906514f137a0e253d6f9593f694f0f7b83143d04
Author: Jürgen Schmidt <jsc at apache.org>
Date: Mon Mar 24 15:18:26 2014 +0000
#124410# #124411# related change to version upgrades code, logging
diff --git a/configure.in b/configure.in
index 9398ec9..79654ae 100644
--- a/configure.in
+++ b/configure.in
@@ -2882,7 +2882,7 @@ if test "z$with_build_version" != "z"; then
BUILD_VER_STRING=$with_build_version
AC_MSG_RESULT([yes, $BUILD_VER_STRING])
else
- BUILD_VER_STRING=
+ BUILD_VER_STRING=`date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)"`
AC_MSG_RESULT([no])
fi
AC_SUBST(BUILD_VER_STRING)
@@ -6294,8 +6294,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
AC_MSG_RESULT([external])
if test "$ENABLE_MEDIAWIKI" = "YES"; then
if test -z $COMMONS_CODEC_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-codec-1.6.jar,
- [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.6.jar ],
+ AC_CHECK_FILE(/usr/share/java/commons-codec-1.9.jar,
+ [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.9.jar ],
[
AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
[ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
@@ -6309,8 +6309,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
fi
if test -z $COMMONS_LANG_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-lang-2.4.jar,
- [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.4.jar ],
+ AC_CHECK_FILE(/usr/share/java/commons-lang3-3.3.jar,
+ [ COMMONS_LANG_JAR=/usr/share/java/commons-lang3-3.3.jar ],
[
AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
[ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
@@ -6340,8 +6340,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
fi
if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; 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/external_deps.lst b/external_deps.lst
index 9931b57..2a14ebdc 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -109,15 +109,14 @@ if (GUI!=UNX || SYSTEM_ZLIB!=YES)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
MD5 = 2c9b0f83ed5890af02c0df1c1776f39b
name = commons-httpclient-3.1-src.tar.gz
- URL1 = http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
+ URL1 = http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
- MD5 = 2e482c7567908d334785ce7d69ddfff7
- name = commons-codec-1.6-src.tar.gz
- URL1 = http://archive.apache.org/dist/commons/codec/source/commons-codec-1.6-src.tar.gz
- URL2 = http://apache.spinellicreations.com//commons/codec/source/commons-codec-1.6-src.tar.gz
- URL3 = $(OOO_EXTRAS)$(MD5)-$(name)
+ MD5 = db87f7004cefc9d17f7ac841f86122bd
+ name = commons-codec-1.9-src.tar.gz
+ URL1 = http://archive.apache.org/dist/commons/codec/source/$(name)
+ URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
MD5 = 2f6ecca935948f7db92d925d88d0d078
@@ -132,10 +131,9 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))
- MD5 = 3c219630e4302863a9a83d0efde889db
- name = commons-logging-1.1.1-src.tar.gz
- # This seems to be the original host, but the MD5 sum does not match.
- # URL1 = http://archive.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz
+ MD5 = e8e197d628436490886d17cffa108fe3
+ name = commons-logging-1.1.3-src.tar.gz
+ URL1 = http://archive.apache.org/dist/commons/logging/source/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_JPEG != YES)
@@ -145,9 +143,9 @@ if (SYSTEM_JPEG != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
- MD5 = 625ff5f2f968dd908bca43c9469d6e6b
- name = commons-lang-2.4-src.tar.gz
- URL1 = http://archive.apache.org/dist/commons/lang/source/commons-lang-2.4-src.tar.gz
+ MD5 = 4c8c505cc3cba4c467c479e3e0f09ba4
+ name = commons-lang3-3.3-src.tar.gz
+ URL1 = http://archive.apache.org/dist/commons/lang/source/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
@@ -242,9 +240,9 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (RAT_JAR_HOME==BUILD)
- MD5 = e4244e69eb3644e71c254aea5952a918
- name = apache-rat-incubating-0.8-bin.tar.bz2
- URL1 = http://archive.apache.org/dist/incubator/rat/binaries/$(name)
+ MD5 = 0f926196d42577addec7e1aa5b510605
+ name = apache-rat-0.10-bin.tar.bz2
+ URL1 = http://archive.apache.org/dist/creadur/apache-rat-0.10/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
###############################################################################
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index d056217..165105d 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -95,7 +95,7 @@
<jar basedir="${classes}" compress="true" jarfile="${dist}/${target}.jar">
<manifest>
<!-- FIXME: Set Class-Path correctly for the system case !-->
- <attribute name="Class-Path" value="commons-codec-1.6.jar commons-lang-2.4.jar commons-httpclient-3.1.jar commons-logging-1.1.1.jar"/>
+ <attribute name="Class-Path" value="commons-codec-1.9.jar commons-lang3-3.3.jar commons-httpclient-3.1.jar commons-logging-1.1.3.jar"/>
<attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
</manifest>
</jar>
diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk
index 42d3456..d36ec94 100644
--- a/swext/mediawiki/makefile.mk
+++ b/swext/mediawiki/makefile.mk
@@ -29,10 +29,10 @@ TARGET=mediawiki
.INCLUDE : ant.mk
.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
-COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.6.jar
-COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.4.jar
+COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.9.jar
+COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang3-3.3.jar
COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-httpclient-3.1.jar
-COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.1.jar
+COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.3.jar
.ELSE
COMP=fix_system_commons
.ENDIF
commit a399c2557be52fb70425cbe78c01b20d1a0122e5
Author: Jürgen Schmidt <jsc at apache.org>
Date: Mon Mar 24 15:15:23 2014 +0000
#124410# #124411# related change to version upgrades code, logging
diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk
index 900c6f6..8caa8c0 100644
--- a/apache-commons/java/httpclient/makefile.mk
+++ b/apache-commons/java/httpclient/makefile.mk
@@ -53,8 +53,8 @@ PATCH_FILES= \
OUT2CLASS=dist$/commons-httpclient.jar
-COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar
-COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.6-SNAPSHOT.jar
+COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.3.jar
+COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.9.jar
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
diff --git a/apache-commons/patches/httpclient.patch b/apache-commons/patches/httpclient.patch
index aa56904..315cd7b 100644
--- a/apache-commons/patches/httpclient.patch
+++ b/apache-commons/patches/httpclient.patch
@@ -1,120 +1,31 @@
-diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/ConnectMethod.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java
---- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/ConnectMethod.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java 2012-05-07 12:37:50.000000000 -0500
-@@ -38,7 +38,7 @@
- /**
- * Establishes a tunneled HTTP connection via the CONNECT method.
- *
-- * @author Ortwin Gl???ck
-+ * @author Ortwin Glueck
- * @author dIon Gillard
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
- * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
-diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClient.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java
---- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClient.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java 2012-05-07 12:37:50.000000000 -0500
-@@ -48,7 +48,7 @@
- * @author <a href="mailto:rwaldhoff at apache.org">Rodney Waldhoff</a>
- * @author Sean C. Sullivan
- * @author <a href="mailto:dion at apache.org">dIon Gillard</a>
-- * @author Ortwin Gl?ck
-+ * @author Ortwin Glueck
- * @author <a href="mailto:becke at u.washington.edu">Michael Becke</a>
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
- * @author Sam Maloney
-diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClientError.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java
---- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClientError.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java 2012-05-07 12:37:50.000000000 -0500
-@@ -33,7 +33,7 @@
- /**
- * Signals that an error has occurred.
- *
-- * @author Ortwin Gl?ck
-+ * @author Ortwin Glueck
- * @version $Revision: 480424 $ $Date: 2006-11-29 06:56:49 +0100 (Wed, 29 Nov 2006) $
- * @since 3.0
- */
-diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpContentTooLargeException.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java
---- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpContentTooLargeException.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java 2012-05-07 12:37:50.000000000 -0500
-@@ -3,7 +3,7 @@
- /**
- * Signals that the response content was larger than anticipated.
- *
-- * @author Ortwin Glück
-+ * @author Ortwin Glueck
- */
- public class HttpContentTooLargeException extends HttpException {
- private int maxlen;
-diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/WireLogInputStream.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java
---- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/WireLogInputStream.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java 2012-05-07 12:37:50.000000000 -0500
-@@ -37,7 +37,7 @@
- /**
- * Logs all data read to the wire LOG.
- *
-- * @author Ortwin Gl�ck
-+ * @author Ortwin Glueck
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
- * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
- *
-diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/BasicScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java
---- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/BasicScheme.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java 2012-05-07 12:37:50.000000000 -0500
-@@ -46,7 +46,7 @@
- * @author <a href="mailto:remm at apache.org">Remy Maucherat</a>
- * @author Rodney Waldhoff
- * @author <a href="mailto:jsdever at apache.org">Jeff Dever</a>
-- * @author Ortwin Gl?ck
-+ * @author Ortwin Glueck
- * @author Sean C. Sullivan
- * @author <a href="mailto:adrian at ephox.com">Adrian Sutton</a>
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
-diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/DigestScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java
---- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/DigestScheme.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java 2012-05-07 12:37:50.000000000 -0500
-@@ -67,7 +67,7 @@
- * @author <a href="mailto:remm at apache.org">Remy Maucherat</a>
- * @author Rodney Waldhoff
- * @author <a href="mailto:jsdever at apache.org">Jeff Dever</a>
-- * @author Ortwin Gl?ck
-+ * @author Ortwin Glueck
- * @author Sean C. Sullivan
- * @author <a href="mailto:adrian at ephox.com">Adrian Sutton</a>
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
-diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/HttpAuthenticator.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java
---- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/HttpAuthenticator.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java 2012-05-07 12:37:50.000000000 -0500
-@@ -62,7 +62,7 @@
- * @author <a href="mailto:remm at apache.org">Remy Maucherat</a>
- * @author Rodney Waldhoff
- * @author <a href="mailto:jsdever at apache.org">Jeff Dever</a>
-- * @author Ortwin Gl�ck
-+ * @author Ortwin Glueck
- * @author Sean C. Sullivan
- * @author <a href="mailto:adrian at ephox.com">Adrian Sutton</a>
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
-diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/NTLMScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java
---- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/NTLMScheme.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java 2012-05-07 12:37:50.000000000 -0500
-@@ -43,7 +43,7 @@
- * @author <a href="mailto:remm at apache.org">Remy Maucherat</a>
- * @author Rodney Waldhoff
- * @author <a href="mailto:jsdever at apache.org">Jeff Dever</a>
-- * @author Ortwin Gl???ck
-+ * @author Ortwin Glueck
- * @author Sean C. Sullivan
- * @author <a href="mailto:adrian at ephox.com">Adrian Sutton</a>
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
-diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/methods/PostMethod.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java
---- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/methods/PostMethod.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java 2012-05-07 12:37:50.000000000 -0500
-@@ -62,7 +62,7 @@
- * @author <a href="mailto:remm at apache.org">Remy Maucherat</a>
- * @author <a href="mailto:dsale at us.britannica.com">Doug Sale</a>
- * @author <a href="mailto:jsdever at apache.org">Jeff Dever</a>
-- * @author Ortwin Gl???ck
-+ * @author Ortwin Glueck
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
- * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
- *
+--- misc/commons-httpclient-3.1/build.xml 2007-08-18 11:02:14.000000000 +0200
++++ misc/build/commons-httpclient-3.1/build.xml 2014-03-11 15:25:51.000000000 +0100
+@@ -181,14 +181,16 @@
+ destdir ="${build.home}/classes"
+ debug ="${compile.debug}"
+ deprecation ="${compile.deprecation}"
+- optimize ="${compile.optimize}">
++ optimize ="${compile.optimize}"
++ encoding ="iso8859-1">
+ <classpath refid="compile.classpath"/>
+ </javac>
+ <javac srcdir ="${source.home}/examples"
+ destdir ="${build.home}/examples"
+ debug ="${compile.debug}"
+ deprecation ="${compile.deprecation}"
+- optimize ="${compile.optimize}">
++ optimize ="${compile.optimize}"
++ encoding ="iso8859-1">
+ <classpath refid="compile.classpath"/>
+ </javac>
+ </target>
+@@ -199,7 +201,8 @@
+ destdir ="${build.home}/tests"
+ debug ="${compile.debug}"
+ deprecation ="${compile.deprecation}"
+- optimize ="${compile.optimize}">
++ optimize ="${compile.optimize}"
++ encoding ="iso8859-1">
+ <classpath refid="test.classpath"/>
+ </javac>
+ <copy todir="${build.home}/tests" filtering="on">
commit dcf788b8bbfb1e5bbc3fd7f3d3dabd3d0113f389
Author: Jürgen Schmidt <jsc at apache.org>
Date: Mon Mar 24 15:10:18 2014 +0000
#124410# update apache commons-lang to version 3.3
diff --git a/apache-commons/java/lang/makefile.mk b/apache-commons/java/lang/makefile.mk
index 0dceb8b..763f2bb 100644
--- a/apache-commons/java/lang/makefile.mk
+++ b/apache-commons/java/lang/makefile.mk
@@ -40,16 +40,20 @@ TAR!:=$(GNUTAR)
.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
# --- Files --------------------------------------------------------
-TARFILE_NAME=commons-lang-2.4-src
-TARFILE_MD5=625ff5f2f968dd908bca43c9469d6e6b
+TARFILE_NAME=commons-lang3-3.3-src
+TARFILE_MD5=4c8c505cc3cba4c467c479e3e0f09ba4
+#TARFILE_NAME=commons-lang-2.4-src
+#TARFILE_MD5=625ff5f2f968dd908bca43c9469d6e6b
-TARFILE_ROOTDIR=commons-lang-2.4-src
+#TARFILE_ROOTDIR=commons-lang-2.4-src
+TARFILE_ROOTDIR=commons-lang3-3.3-src
#PATCH_FILES=$(PRJ)$/patches$/logging.patch
#CONVERTFILES=build.xml
-
-OUT2CLASS=dist$/commons-lang-2.4.jar
+
+OUT2CLASS=target$/commons-lang3-3.3.jar
+#OUT2CLASS=dist$/commons-lang-2.4.jar
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
diff --git a/apache-commons/prj/d.lst b/apache-commons/prj/d.lst
index 0dbe582..2fe8e6a 100644
--- a/apache-commons/prj/d.lst
+++ b/apache-commons/prj/d.lst
@@ -1,5 +1,5 @@
-..\%__SRC%\class\commons-logging-1.1.1-SNAPSHOT.jar %_DEST%\bin%_EXT%\commons-logging-1.1.1.jar
-..\%__SRC%\class\commons-codec-1.6-SNAPSHOT.jar %_DEST%\bin%_EXT%\commons-codec-1.6.jar
+..\%__SRC%\class\commons-logging-1.1.3.jar %_DEST%\bin%_EXT%\commons-logging-1.1.3.jar
+..\%__SRC%\class\commons-codec-1.9.jar %_DEST%\bin%_EXT%\commons-codec-1.9.jar
..\%__SRC%\class\commons-httpclient.jar %_DEST%\bin%_EXT%\commons-httpclient-3.1.jar
-..\%__SRC%\class\commons-lang-2.4.jar %_DEST%\bin%_EXT%\commons-lang-2.4.jar
+..\%__SRC%\class\commons-lang3-3.3.jar %_DEST%\bin%_EXT%\commons-lang3-3.3.jar
commit c2a49f654e386fecafb89cd2b758892f250f6290
Author: Jürgen Schmidt <jsc at apache.org>
Date: Mon Mar 24 15:08:40 2014 +0000
#124410# update apache commons-codec to version 1.6
diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk
index 4fab6d1..b31f85d 100644
--- a/apache-commons/java/codec/makefile.mk
+++ b/apache-commons/java/codec/makefile.mk
@@ -38,16 +38,21 @@ ANT_BUILDFILE=build.xml
.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
# --- Files --------------------------------------------------------
-TARFILE_NAME=commons-codec-1.6-src
-TARFILE_MD5=2e482c7567908d334785ce7d69ddfff7
+TARFILE_NAME=commons-codec-1.9-src
+TARFILE_MD5=db87f7004cefc9d17f7ac841f86122bd
+#TARFILE_NAME=commons-codec-1.6-src
+#TARFILE_MD5=2e482c7567908d334785ce7d69ddfff7
-TARFILE_ROOTDIR=commons-codec-1.6-src
+TARFILE_ROOTDIR=commons-codec-1.9-src
+#TARFILE_ROOTDIR=commons-codec-1.6-src
-PATCH_FILES=$(PRJ)$/patches$/codec.patch
+#PATCH_FILES=
+#PATCH_FILES=$(PRJ)$/patches$/codec.patch
#CONVERTFILES=build.xml
-
-OUT2CLASS=dist$/commons-codec-1.6-SNAPSHOT.jar
+
+OUT2CLASS=dist$/commons-codec-1.9.jar
+#OUT2CLASS=dist$/commons-codec-1.6-SNAPSHOT.jar
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
diff --git a/apache-commons/patches/codec.patch b/apache-commons/patches/codec.patch
index 6b4b3e1..ca3bcc9 100644
--- a/apache-commons/patches/codec.patch
+++ b/apache-commons/patches/codec.patch
@@ -1,20 +1,20 @@
---- misc/build/commons-codec-1.6-src/build.xml-old 2012-05-05 22:12:32.000000000 -0500
-+++ misc/build/commons-codec-1.6-src/build.xml 2012-05-05 22:16:00.000000000 -0500
+--- misc/build/commons-codec-1.9-src/build.xml-old 2012-05-05 22:12:32.000000000 -0500
++++ misc/build/commons-codec-1.9-src/build.xml 2012-05-05 22:16:00.000000000 -0500
@@ -96,7 +96,6 @@
- </target>
- <target name="dist" depends="compile, javadoc" description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
-- <copy file="${basedir}/LICENSE.txt" todir="${dist.home}"/>
- <copy file="${basedir}/NOTICE.txt" todir="${dist.home}"/>
- <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
- <antcall target="jar"/>
+ </target>
+ <target name="dist" depends="compile, javadoc" description="Create binary distribution">
+ <mkdir dir="${dist.home}"/>
+- <copy file="${basedir}/LICENSE.txt" todir="${dist.home}"/>
+ <copy file="${basedir}/NOTICE.txt" todir="${dist.home}"/>
+ <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
+ <antcall target="jar"/>
@@ -104,8 +103,7 @@
- <target name="jar" depends="compile" description="Create jar">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${build.home}/classes/META-INF"/>
-- <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-- <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
-+ <copy file="${basedir}/NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
- <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes">
- <manifest>
- <attribute name="Specification-Title" value="Commons Codec"/>
+ <target name="jar" depends="compile" description="Create jar">
+ <mkdir dir="${dist.home}"/>
+ <mkdir dir="${build.home}/classes/META-INF"/>
+- <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+- <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
++ <copy file="${basedir}/NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+ <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes">
+ <manifest>
+ <attribute name="Specification-Title" value="Commons Codec"/>
commit f12f59f6ac8234b61684fbd05b433b16cc1a74e8
Author: Jürgen Schmidt <jsc at apache.org>
Date: Mon Mar 24 15:07:23 2014 +0000
#124410# update apache commons-logging to version 1.1.3
diff --git a/reportbuilder/java/com/sun/star/report/makefile.mk b/reportbuilder/java/com/sun/star/report/makefile.mk
index b33a0c0..c90224e 100644
--- a/reportbuilder/java/com/sun/star/report/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/makefile.mk
@@ -34,7 +34,7 @@ JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
.IF "$(SYSTEM_APACHE_COMMONS)" == "YES"
EXTRAJARFILES = $(COMMONS_LOGGING_JAR)
.ELSE
-JARFILES += commons-logging-1.1.1.jar
+JARFILES += commons-logging-1.1.3.jar
.ENDIF
JAVAFILES := DataRow.java\
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf b/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
index 5d27005..7875e1b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
+++ b/reportbuilder/java/com/sun/star/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-0.2.10.jar
libloader-1.1.6.jar librepository-1.1.6.jar libxml-1.1.7.jar
- flow-engine-0.9.4.jar sac.jar commons-logging-1.1.1.jar
+ flow-engine-0.9.4.jar sac.jar commons-logging-1.1.3.jar
UNO-Type-Path:
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
index 21c0bc3..fb3aae8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
@@ -53,7 +53,7 @@ JARFILES += \
.IF "$(SYSTEM_APACHE_COMMONS)" == "YES"
EXTRAJARFILES += $(COMMONS_LOGGING_JAR)
.ELSE
-JARFILES += commons-logging-1.1.1.jar
+JARFILES += commons-logging-1.1.3.jar
.ENDIF
.IF "$(SYSTEM_JFREEREPORT)" == "YES" || "$(SYSTEM_APACHE_COMMONS)" == "YES"
@@ -69,7 +69,7 @@ JAVAFILES := $(shell @$(FIND) . -name "*.java")
PROPERTYFILES := $(CLASSDIR)$/$(PACKAGE)$/configuration.properties \
$(CLASSDIR)$/$(PACKAGE)$/module.properties \
$(CLASSDIR)$/$(PACKAGE)$/parser$/selectors.properties
-
+
# CSSFILES := $(subst,./,$(CLASSDIR)$/$(PACKAGE)$/ $(shell @$(FIND) . -name "*.css"))
CSSFILES := $(CLASSDIR)$/$(PACKAGE)$/oasis-datastyle.css\
$(CLASSDIR)$/$(PACKAGE)$/oasis-draw.css\
@@ -86,12 +86,12 @@ CSSFILES := $(CLASSDIR)$/$(PACKAGE)$/oasis-datastyle.css\
XSDFILES := $(CLASSDIR)$/$(PACKAGE)$/parser$/rpt-schema-v1.0-os.xsd \
$(CLASSDIR)$/$(PACKAGE)$/styles$/stylemapper.xsd
-
+
XMLFILES := $(CLASSDIR)$/$(PACKAGE)$/styles$/stylemapper.xml
-
+
TXTFILES := $(CLASSDIR)$/$(PACKAGE)$/parser$/style-mapping.txt
-
+
#----- make a jar from compiled files ------------------------------
JARCLASSDIRS = .
@@ -137,7 +137,7 @@ $(CLASSDIR)$/$(PACKAGE)$/%.css : %.css
$(CLASSDIR)$/$(PACKAGE)$/%.xsd : %.xsd
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-
+
$(CLASSDIR)$/$(PACKAGE)$/%.xml : %.xml
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 41cf3bc..b31ede7 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -71,7 +71,7 @@ COMPONENT_MERGED_XCU= \
COMPONENT_OTR_FILES= \
$(EXTENSIONDIR)$/template$/en-US$/wizard$/report$/default.otr
-
+
COMPONENT_IMAGES= \
$(EXTENSIONDIR)$/images$/extension_32.png \
$(EXTENSIONDIR)$/images$/extension_32_h.png
@@ -107,7 +107,7 @@ COMPONENT_EXTJARFILES += \
.ENDIF
.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
COMPONENT_EXTJARFILES += \
- $(EXTENSIONDIR)$/commons-logging-1.1.1.jar
+ $(EXTENSIONDIR)$/commons-logging-1.1.3.jar
.ENDIF
COMPONENT_MANIFEST_GENERIC:=TRUE
commit a94568a3ffd2c87c3caf819b8f9d52d0fc42d709
Author: Jürgen Schmidt <jsc at apache.org>
Date: Mon Mar 24 15:06:56 2014 +0000
#124410# update apache commons-logging to version 1.1.3
diff --git a/apache-commons/java/logging/makefile.mk b/apache-commons/java/logging/makefile.mk
index 99a8504..d5bd2f2 100644
--- a/apache-commons/java/logging/makefile.mk
+++ b/apache-commons/java/logging/makefile.mk
@@ -38,16 +38,20 @@ ANT_BUILDFILE=build.xml
.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
# --- Files --------------------------------------------------------
-TARFILE_NAME=commons-logging-1.1.1-src
-TARFILE_MD5=3c219630e4302863a9a83d0efde889db
+TARFILE_NAME=commons-logging-1.1.3-src
+TARFILE_MD5=e8e197d628436490886d17cffa108fe3
+#TARFILE_NAME=commons-logging-1.1.1-src
+#TARFILE_MD5=3c219630e4302863a9a83d0efde889db
-TARFILE_ROOTDIR=commons-logging-1.1.1-src
+TARFILE_ROOTDIR=commons-logging-1.1.3-src
+#TARFILE_ROOTDIR=commons-logging-1.1.1-src
PATCH_FILES=$(PRJ)$/patches$/logging.patch
CONVERTFILES=build.xml
-
-OUT2CLASS=target$/commons-logging-1.1.1-SNAPSHOT.jar
+
+OUT2CLASS=target$/commons-logging-1.1.3.jar
+#OUT2CLASS=target$/commons-logging-1.1.1-SNAPSHOT.jar
.IF "$(SYSTEM_TOMCAT)" != "YES"
SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar
diff --git a/apache-commons/patches/logging.patch b/apache-commons/patches/logging.patch
index f96eda3..653360e 100644
--- a/apache-commons/patches/logging.patch
+++ b/apache-commons/patches/logging.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- misc/commons-logging-1.1.3-src/build.xml 2014-03-11 13:13:20.000000000 +0100
++++ misc/build/commons-logging-1.1.3-src/build.xml 2014-03-11 13:13:20.000000000 +0100
+@@ -130,10 +130,10 @@
<!-- ========== Compiler Defaults ========================================= -->
<!-- Version of java class files to generate. -->
commit 020ebc1e129f59b0a55358bc7baa11a610a83849
Author: Jürgen Schmidt <jsc at apache.org>
Date: Mon Mar 24 15:01:34 2014 +0000
#124415# update to rat 0.10
diff --git a/rat-excludes b/rat-excludes
index 7224c30..0f08f157 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -1472,3 +1472,19 @@ main/vcl/unx/generic/fontmanager/parseAFM.hxx
main/icc/source/create_sRGB_profile/Makefile.in
+
+##############################################################################
+#
+# exclude generated files during the build, e.g. config files, environment scripts
+#
+
+main/config.log
+main/config.parms
+main/config.status
+main/configure
+main/warn
+main/autom4te.cache/*
+
+main/LinuxX86-64Env.Set*
+main/MacOSXX64Env.Set*
+main/winenv.set*
More information about the Libreoffice-commits
mailing list