From b7b47abdc82f67cf51a74eec02ed453477ce57b90ea0d302c2d6db8f04a733b5 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 7 Sep 2017 12:08:46 +0000
Subject: [PATCH] Fix build with java 9

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=29
---
 apache-commons-logging.changes         |  8 ++++++++
 apache-commons-logging.spec            |  2 ++
 commons-logging-1.2-sourcetarget.patch | 15 +++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 commons-logging-1.2-sourcetarget.patch

diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes
index 662120f..3cc0cb7 100644
--- a/apache-commons-logging.changes
+++ b/apache-commons-logging.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep  7 12:07:36 UTC 2017 - fstrba@suse.com
+
+- Added patch:
+  * commons-logging-1.2-sourcetarget.patch
+    - set java source and target versions to 1.6 in order to allow
+      build with jdk9
+
 -------------------------------------------------------------------
 Fri May 19 11:03:15 UTC 2017 - tchvatal@suse.com
 
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index a2e5e98..0044af3 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -31,6 +31,7 @@ Source1:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_n
 Source2:        apache-commons-logging.keyring
 Source3:        http://central.maven.org/maven2/commons-logging/commons-logging/%{version}/%{short_name}-%{version}.pom
 Patch0:         commons-logging-1.1.3-src-junit.diff
+Patch1:         commons-logging-1.2-sourcetarget.patch
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  apache-commons-parent
@@ -61,6 +62,7 @@ logging implementation.
 %prep
 %setup -q -n %{short_name}-%{version}-src
 %patch0 -p1
+%patch1 -p1
 
 # Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
 %pom_remove_dep :avalon-framework
diff --git a/commons-logging-1.2-sourcetarget.patch b/commons-logging-1.2-sourcetarget.patch
new file mode 100644
index 0000000..128eef8
--- /dev/null
+++ b/commons-logging-1.2-sourcetarget.patch
@@ -0,0 +1,15 @@
+--- commons-logging-1.2-src/build.xml	2014-07-05 20:11:36.000000000 +0200
++++ commons-logging-1.2-src/build.xml	2017-09-07 14:05:10.680439161 +0200
+@@ -130,10 +130,10 @@
+ <!-- ========== Compiler Defaults ========================================= -->
+ 
+   <!-- Version of java class files to generate. -->
+-  <property name="target.version" value="1.2"/>
++  <property name="target.version" value="1.6"/>
+ 
+   <!-- Version of java source to accept -->
+-  <property name="source.version" value="1.2"/>
++  <property name="source.version" value="1.6"/>
+ 
+   <!-- Should Java compilations set the 'debug' compiler option? -->
+   <property name="compile.debug"           value="true"/>