Accepting request 752786 from Java:packages

fix build in factory

OBS-URL: https://build.opensuse.org/request/show/752786
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/felix-shell?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2019-12-02 10:34:55 +00:00 committed by Git OBS Bridge
commit 1a0b5a521c
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 2 06:30:52 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Specify maven.compiler.release to fix javadoc build with jdk11
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 7 10:10:09 UTC 2019 - Fridrich Strba <fstrba@suse.com> Tue May 7 10:10:09 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package felix-shell # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -53,7 +53,10 @@ This package contains API documentation for %{name}.
%{mvn_file} :%{bundle} "felix/%{bundle}" %{mvn_file} :%{bundle} "felix/%{bundle}"
%build %build
%{mvn_build} -f %{mvn_build} -f \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-- -Dmaven.compiler.release=6
%endif
%install %install
%mvn_install %mvn_install