You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2014/03/24 16:06:57 UTC
svn commit: r1580876 - in /openoffice/trunk/main/apache-commons:
java/logging/makefile.mk patches/logging.patch
Author: jsc
Date: Mon Mar 24 15:06:56 2014
New Revision: 1580876
URL: http://svn.apache.org/r1580876
Log:
#124410# update apache commons-logging to version 1.1.3
Modified:
openoffice/trunk/main/apache-commons/java/logging/makefile.mk
openoffice/trunk/main/apache-commons/patches/logging.patch
Modified: openoffice/trunk/main/apache-commons/java/logging/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/apache-commons/java/logging/makefile.mk?rev=1580876&r1=1580875&r2=1580876&view=diff
==============================================================================
--- openoffice/trunk/main/apache-commons/java/logging/makefile.mk (original)
+++ openoffice/trunk/main/apache-commons/java/logging/makefile.mk Mon Mar 24 15:06:56 2014
@@ -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
Modified: openoffice/trunk/main/apache-commons/patches/logging.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/apache-commons/patches/logging.patch?rev=1580876&r1=1580875&r2=1580876&view=diff
==============================================================================
--- openoffice/trunk/main/apache-commons/patches/logging.patch (original)
+++ openoffice/trunk/main/apache-commons/patches/logging.patch Mon Mar 24 15:06:56 2014
@@ -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. -->