From 05e252bbb0d81267e5d5adb6b2eee3013280d8afa4f2a4a26ab1ecbb79581e03 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 15 May 2018 10:59:09 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=31

---
 apache-commons-logging.changes         | 8 ++++++++
 apache-commons-logging.spec            | 6 +++---
 commons-logging-1.2-sourcetarget.patch | 4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes
index 3cc0cb7..3617b3e 100644
--- a/apache-commons-logging.changes
+++ b/apache-commons-logging.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue May 15 10:56:40 UTC 2018 - fstrba@suse.com
+
+- Modified patch:
+  * commons-logging-1.2-sourcetarget.patch
+    + Build with source and target 8 to prepare for a possible
+      removal of 1.6 compatibility in OpenJDK 11
+
 -------------------------------------------------------------------
 Thu Sep  7 12:07:36 UTC 2017 - fstrba@suse.com
 
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 0044af3..598081c 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-logging
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2007, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -35,13 +35,13 @@ Patch1:         commons-logging-1.2-sourcetarget.patch
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  apache-commons-parent
-BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
 BuildRequires:  log4j-mini >= 1.2
 BuildRequires:  servletapi5
-Requires:       java >= 1.6.0
+Requires:       java >= 1.8
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{version}
 Provides:       %{short_name} = %{version}-%{release}
diff --git a/commons-logging-1.2-sourcetarget.patch b/commons-logging-1.2-sourcetarget.patch
index 128eef8..1761f82 100644
--- a/commons-logging-1.2-sourcetarget.patch
+++ b/commons-logging-1.2-sourcetarget.patch
@@ -5,11 +5,11 @@
  
    <!-- Version of java class files to generate. -->
 -  <property name="target.version" value="1.2"/>
-+  <property name="target.version" value="1.6"/>
++  <property name="target.version" value="8"/>
  
    <!-- Version of java source to accept -->
 -  <property name="source.version" value="1.2"/>
-+  <property name="source.version" value="1.6"/>
++  <property name="source.version" value="8"/>
  
    <!-- Should Java compilations set the 'debug' compiler option? -->
    <property name="compile.debug"           value="true"/>

From 1479ff15766f1c88443bf2002135456d6fcff46a1fb0e41cd63e582ce6abd80a Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 17 May 2018 19:51:40 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=32

---
 apache-commons-logging.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes
index 3617b3e..148d4c7 100644
--- a/apache-commons-logging.changes
+++ b/apache-commons-logging.changes
@@ -4,7 +4,7 @@ Tue May 15 10:56:40 UTC 2018 - fstrba@suse.com
 - Modified patch:
   * commons-logging-1.2-sourcetarget.patch
     + Build with source and target 8 to prepare for a possible
-      removal of 1.6 compatibility in OpenJDK 11
+      removal of 1.6 compatibility
 
 -------------------------------------------------------------------
 Thu Sep  7 12:07:36 UTC 2017 - fstrba@suse.com