From cb155691b3aacac2ee6cdaa5b1a4904e04e847d40a7643d56181a71df220fe9d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 09:15:59 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/felix-shell?expand=0&rev=3 --- felix-shell.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/felix-shell.spec b/felix-shell.spec index 6ba18eb..fcbcb76 100644 --- a/felix-shell.spec +++ b/felix-shell.spec @@ -1,7 +1,7 @@ # # spec file for package felix-shell # -# Copyright (c) 2019 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 @@ -53,7 +53,7 @@ This package contains API documentation for %{name}. %{mvn_file} :%{bundle} "felix/%{bundle}" %build -%{mvn_build} -f +%{mvn_build} -f -- -Dmaven.compiler.release=6 %install %mvn_install From 286a0a6d22f6d513534f2f85ed777bbc0ee31e5a40c5ba60915901a75e79a9f0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 14:42:16 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/felix-shell?expand=0&rev=4 --- felix-shell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/felix-shell.spec b/felix-shell.spec index fcbcb76..69fefd9 100644 --- a/felix-shell.spec +++ b/felix-shell.spec @@ -53,7 +53,10 @@ This package contains API documentation for %{name}. %{mvn_file} :%{bundle} "felix/%{bundle}" %build -%{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 782984dec6f539c4eb356494c78c948dbcb71ddf277cdde5c74bb9704fb811bd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 2 Dec 2019 06:31:08 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/felix-shell?expand=0&rev=5 --- felix-shell.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/felix-shell.changes b/felix-shell.changes index 6ceaafe..f725a45 100644 --- a/felix-shell.changes +++ b/felix-shell.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 2 06:30:52 UTC 2019 - Fridrich Strba + +- Specify maven.compiler.release to fix javadoc build with jdk11 + ------------------------------------------------------------------- Tue May 7 10:10:09 UTC 2019 - Fridrich Strba