From 4be2a59644439bbc7adfd35af7f4f7c340b0a036 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu, 17 Jul 2008 12:40:25 +0000
Subject: INTEGRATION: CWS ause095 (1.1.8); FILE MERGED 2008/07/09 08:31:06 hjs
 1.1.8.1: #i90789# - no dos lineends

---
 apache-commons/patches/logging.patch | 40 ++++++++++++++----------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

(limited to 'apache-commons')

diff --git a/apache-commons/patches/logging.patch b/apache-commons/patches/logging.patch
index b1c4b6652fa0..63b93dcbd6f2 100644
--- a/apache-commons/patches/logging.patch
+++ b/apache-commons/patches/logging.patch
@@ -1,25 +1,15 @@
-*** misc/build/commons-logging-1.1.1-src/build.xml-old	2008-02-01 13:16:54.000000000 +0100
---- misc/build/commons-logging-1.1.1-src/build.xml	2008-02-01 13:17:09.000000000 +0100
-***************
-*** 127,136 ****
-  <!-- ========== Compiler Defaults ========================================= -->
-  
-    <!-- Version of java class files to generate. -->
-!   <property name="target.version" value="1.1"/>
-  
-    <!-- Version of java source to accept -->
-!   <property name="source.version" value="1.2"/>
-  
-    <!-- Should Java compilations set the 'debug' compiler option? -->
-    <property name="compile.debug"           value="true"/>
---- 127,136 ----
-  <!-- ========== Compiler Defaults ========================================= -->
-  
-    <!-- Version of java class files to generate. -->
-!   <property name="target.version" value="1.3"/>
-  
-    <!-- Version of java source to accept -->
-!   <property name="source.version" value="1.3"/>
-  
-    <!-- Should Java compilations set the 'debug' compiler option? -->
-    <property name="compile.debug"           value="true"/>
+--- 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 @@
+ <!-- ========== Compiler Defaults ========================================= -->
+ 
+   <!-- Version of java class files to generate. -->
+-  <property name="target.version" value="1.1"/>
++  <property name="target.version" value="1.3"/>
+ 
+   <!-- Version of java source to accept -->
+-  <property name="source.version" value="1.2"/>
++  <property name="source.version" value="1.3"/>
+ 
+   <!-- Should Java compilations set the 'debug' compiler option? -->
+   <property name="compile.debug"           value="true"/>
-- 
cgit