#124410# update apache commons-logging to version 1.1.3

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\

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: 

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) $< $@    

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