Dominique Leuenberger 2019-11-26 16:00:01 +00:00 committed by Git OBS Bridge
commit 5ccdfe5a24
4 changed files with 15 additions and 5 deletions

View File

@ -1,7 +1,7 @@
# #
# spec file for package maven # spec file for package maven-plugin-plugin-bootstrap
# #
# 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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Nov 24 17:30:49 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:16:17 UTC 2019 - Fridrich Strba <fstrba@suse.com> Wed Apr 3 09:16:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package maven-plugin-plugin # spec file for package maven-plugin-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
@ -133,7 +133,11 @@ API documentation for %{name}.
%build %build
pushd %{name} pushd %{name}
%{mvn_file} :%{name} %{base_name}/%{name} %{mvn_file} :%{name} %{base_name}/%{name}
%{mvn_build} -f -- -Dmaven.compiler.source=6 -Dmaven.compiler.target=6 %{mvn_build} -f \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-- -Dmaven.compiler.release=6
%endif
popd popd
%install %install

View File

@ -1,7 +1,7 @@
# #
# spec file for package maven-plugin-tools # spec file for package maven-plugin-tools
# #
# 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