1
0

Accepting request 750626 from Java:packages

fix build with new maven-javadoc-plugin

OBS-URL: https://build.opensuse.org/request/show/750626
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-resources-plugin?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2019-11-26 16:00:27 +00:00 committed by Git OBS Bridge
commit 7f505191f5
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Nov 24 17:47:59 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Specify maven.compiler.release to fix build with jdk9+ and newer
maven-javadoc-plugin
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 3 09:27:51 UTC 2019 - Fridrich Strba <fstrba@suse.com> Wed Apr 3 09:27:51 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package maven # spec file for package maven-resources-plugin
# #
# 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
@ -105,6 +105,9 @@ build-jar-repository -s lib \
%else %else
xmvn --batch-mode --offline \ xmvn --batch-mode --offline \
-Dmaven.test.skip=true \ -Dmaven.test.skip=true \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-Dmaven.compiler.release=7 \
%endif
package org.apache.maven.plugins:maven-javadoc-plugin:aggregate package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
%endif %endif