Accepting request 751527 from Java:packages

Fix build with recent maven-javadoc-plugin

OBS-URL: https://build.opensuse.org/request/show/751527
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/felix-gogo-runtime?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2019-11-28 12:50:58 +00:00 committed by Git OBS Bridge
commit 4f256da033
2 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 28 08:52:53 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Specify maven.compiler.release to fix javadoc build with jdk11
-------------------------------------------------------------------
Wed May 8 11:29:37 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package felix-gogo-runtime
#
# 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
@ -31,7 +31,6 @@ BuildRequires: mvn(org.apache.felix:gogo-parent:pom:) >= 4
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.osgi:osgi.cmpn)
BuildRequires: mvn(org.osgi:osgi.core)
BuildConflicts: java-devel >= 9
BuildArch: noarch
%description
@ -51,7 +50,10 @@ This package contains the API documentation for %{name}.
%{mvn_file} : felix/%{bundle}
%build
%{mvn_build} -f
%{mvn_build} -f \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-- -Dmaven.compiler.release=8
%endif
%install
%mvn_install