From 2ff81599483ee96322a573674e68458283d349295e68be43c66cf62564750779 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 22 Nov 2019 07:50:05 +0000
Subject: [PATCH 1/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-osgi?expand=0&rev=4

---
 maven-osgi.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/maven-osgi.spec b/maven-osgi.spec
index 1ad37ac..c80bcd5 100644
--- a/maven-osgi.spec
+++ b/maven-osgi.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package maven-osgi
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,11 +31,11 @@ Source0:        %{name}-%{version}.tar.xz
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 BuildRequires:  fdupes
 BuildRequires:  maven-local
+BuildRequires:  xz
 BuildRequires:  mvn(biz.aQute:bndlib)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
 BuildRequires:  mvn(org.apache.maven:maven-project)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
-BuildRequires:  xz
 BuildArch:      noarch
 
 %description
@@ -62,7 +62,7 @@ sed -i 's/import aQute\.lib\.osgi/import aQute.bnd.osgi/g' src/main/java/org/apa
 
 %build
 # Tests depend on binary JARs which were removed from sources
-%{mvn_build} -f
+%{mvn_build} -f -- -Dmaven.compiler.release=6
 
 %install
 %mvn_install

From 5f452a3e1a10273265883008795b751271867c8b9ea779b33d964019355c2bd6 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 22 Nov 2019 15:49:27 +0000
Subject: [PATCH 2/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-osgi?expand=0&rev=5

---
 maven-osgi.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/maven-osgi.spec b/maven-osgi.spec
index c80bcd5..c40d36a 100644
--- a/maven-osgi.spec
+++ b/maven-osgi.spec
@@ -61,8 +61,10 @@ sed -i 's/import aQute\.lib\.osgi/import aQute.bnd.osgi/g' src/main/java/org/apa
 %pom_xpath_set "pom:artifactId[text()='plexus-maven-plugin']" plexus-component-metadata
 
 %build
-# Tests depend on binary JARs which were removed from sources
-%{mvn_build} -f -- -Dmaven.compiler.release=6
+%{mvn_build} -f \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+	-- -Dmaven.compiler.release=6
+%endif
 
 %install
 %mvn_install

From 45e8f8456c7e3c93deb1a8132982c9eaf1e77b3c97615ad15ba148bd79c83721 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 24 Nov 2019 17:06:48 +0000
Subject: [PATCH 3/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-osgi?expand=0&rev=6

---
 maven-osgi.changes | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maven-osgi.changes b/maven-osgi.changes
index 0fbb86f..105e8ac 100644
--- a/maven-osgi.changes
+++ b/maven-osgi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 24 17:06:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Specify maven.compiler.release to fix build with jdk9+ and newer
+  maven-javadoc-plugin
+
 -------------------------------------------------------------------
 Fri May  3 15:03:52 UTC 2019 - Fridrich Strba <fstrba@suse.com>