Accepting request 750525 from Java:packages

fix build with new maven-javadoc-plugin

OBS-URL: https://build.opensuse.org/request/show/750525
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/decentxml?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2019-11-26 15:56:12 +00:00 committed by Git OBS Bridge
commit d99e797139
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Nov 24 12:14:25 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Specify maven.compiler.release to fix build with jdk9+ and newer
maven-javadoc-plugin
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 2 21:26:11 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Sun Jun 2 21:26:11 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package decentxml # spec file for package decentxml
# #
# Copyright (c) 2018 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
@ -28,9 +28,9 @@ Source0: https://storage.googleapis.com/google-code-archive-downloads/v2/
Source1: http://www.w3.org/XML/Test/xmlts20031210.zip Source1: http://www.w3.org/XML/Test/xmlts20031210.zip
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: unzip
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: unzip
BuildArch: noarch BuildArch: noarch
%description %description
@ -66,7 +66,10 @@ sed -i -e "s|junit-dep|junit|g" pom.xml
%build %build
%{mvn_file} : %{name} %{mvn_file} : %{name}
%{mvn_build} -f -- -Dsource=6 %{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