Accepting request 750606 from Java:packages

fix build with new maven-javadoc-plugin

OBS-URL: https://build.opensuse.org/request/show/750606
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-plugin-bundle?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2019-11-26 15:59:48 +00:00 committed by Git OBS Bridge
commit 4ee149c54c
2 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Nov 24 17:27:56 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Specify maven.compiler.release to fix build with jdk9+ and newer
maven-javadoc-plugin
-------------------------------------------------------------------
Sat Apr 6 12:07:07 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package maven-plugin-bundle
#
# 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
@ -111,8 +111,10 @@ rm -f src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
%endif
%build
# Tests depend on bundled JARs
%{mvn_build} -f
%{mvn_build} -f \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-- -Dmaven.compiler.release=7
%endif
%install
%mvn_install