Accepting request 750628 from Java:packages
fix build with new maven-javadoc-plugin OBS-URL: https://build.opensuse.org/request/show/750628 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-surefire?expand=0&rev=3
This commit is contained in:
commit
f5fca8b1e5
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Nov 24 17:49:18 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:30:18 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Wed Apr 3 09:30:18 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package maven
|
# spec file for package maven-surefire-plugins
|
||||||
#
|
#
|
||||||
# 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
|
||||||
@ -168,7 +168,11 @@ for i in \
|
|||||||
maven-surefire-plugin \
|
maven-surefire-plugin \
|
||||||
maven-surefire-report-plugin; do
|
maven-surefire-report-plugin; do
|
||||||
pushd ${i}
|
pushd ${i}
|
||||||
%mvn_build -f
|
%mvn_build -f \
|
||||||
|
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
|
||||||
|
-- -Dmaven.compiler.release=6
|
||||||
|
%endif
|
||||||
|
|
||||||
popd
|
popd
|
||||||
%mvn_artifact ${i}/pom.xml ${i}/target/${i}-%{version}.jar
|
%mvn_artifact ${i}/pom.xml ${i}/target/${i}-%{version}.jar
|
||||||
if [ -d ${i}/target/site/apidocs ]; then
|
if [ -d ${i}/target/site/apidocs ]; then
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Nov 24 17:49:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Specify maven.compiler.release to fix build with jdk9+ and newer
|
||||||
|
maven-javadoc-plugin
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 1 13:28:26 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Mon Jul 1 13:28:26 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package maven
|
# spec file for package maven-surefire-provider-junit5
|
||||||
#
|
#
|
||||||
# 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,7 +105,11 @@ sed -i /-Xdoclint:all/d pom.xml
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
pushd surefire-providers/surefire-junit-platform
|
pushd surefire-providers/surefire-junit-platform
|
||||||
%mvn_build -f
|
%mvn_build -f \
|
||||||
|
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
|
||||||
|
-- -Dmaven.compiler.release=8
|
||||||
|
%endif
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package maven-surefire
|
# spec file for package maven-surefire
|
||||||
#
|
#
|
||||||
# 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
|
||||||
|
Loading…
Reference in New Issue
Block a user