summaryrefslogtreecommitdiff
path: root/apache-commons
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-07-17 12:40:25 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-07-17 12:40:25 +0000
commit4be2a59644439bbc7adfd35af7f4f7c340b0a036 (patch)
tree6282437e934bdada55d9cda8740acaa5396cf1d3 /apache-commons
parenta0c00fb7566300e9b800d6b89b7ef5bf040b7f46 (diff)
INTEGRATION: CWS ause095 (1.1.8); FILE MERGED
2008/07/09 08:31:06 hjs 1.1.8.1: #i90789# - no dos lineends
Diffstat (limited to 'apache-commons')
-rw-r--r--apache-commons/patches/logging.patch40
1 files changed, 15 insertions, 25 deletions
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"/>