From 0595f3ff18f1105ba7bea4a9599c071575ea703c Mon Sep 17 00:00:00 2001
From: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date: Mon, 6 Oct 2014 10:20:53 +0200
Subject: Allow building with java9 (first installement)

In java9, there is no option for source/target 1.5,
the lowest version is 1.6.
This commit also patches the relevant external libraries
in order to be able to build with build-wide source/target

Change-Id: I68807c973a2a8be2f9b3a6e01243e36cb7110a12
---
 external/apache-commons/patches/logging.patch | 29 ++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'external/apache-commons')

diff --git a/external/apache-commons/patches/logging.patch b/external/apache-commons/patches/logging.patch
index 953cf614768d..c225e5a30338 100644
--- a/external/apache-commons/patches/logging.patch
+++ b/external/apache-commons/patches/logging.patch
@@ -1,19 +1,19 @@
 --- 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
-@@ -130,10 +130,10 @@
+@@ -129,12 +129,6 @@
+   
  <!-- ========== Compiler Defaults ========================================= -->
  
-   <!-- Version of java class files to generate. -->
+-  <!-- Version of java class files to generate. -->
 -  <property name="target.version" value="1.2"/>
-+  <property name="target.version" value="1.5"/>
- 
-   <!-- Version of java source to accept -->
+-
+-  <!-- 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"/>
-@@ -283,6 +283,10 @@
+ 
+@@ -283,6 +277,10 @@
                 classpathref="compile.classpath"
                 classname="org.apache.avalon.framework.logger.Logger"/>
  
@@ -24,7 +24,18 @@
      <available file="${log4j12.jar}" property="log4j12.present"/>
      <available file="${log4j13.jar}" property="log4j13.present"/>
      <available file="${build.home}/docs" property="maven.generated.docs.present"/>
-@@ -373,6 +377,8 @@
+@@ -362,8 +360,8 @@
+            debug="${compile.debug}"
+            deprecation="${compile.deprecation}"
+            optimize="${compile.optimize}"
+-           source="${source.version}"
+-           target="${target.version}">
++           source="${ant.build.javac.source}"
++           target="${ant.build.javac.target}">
+ 
+       <classpath refid="compile.classpath"/>
+     
+@@ -373,6 +371,8 @@
                 unless="logkit.present"/>
        <exclude name="org/apache/commons/logging/impl/AvalonLogger.java"
                 unless="avalon-framework.present"/>
-- 
cgit