SHA256
1
0
forked from pool/jcsp

Accepting request 750540 from Java:packages

fix build with new maven-javadoc-plugin

OBS-URL: https://build.opensuse.org/request/show/750540
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jcsp?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2019-11-26 15:57:14 +00:00 committed by Git OBS Bridge
commit 61154c1c30
2 changed files with 13 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Nov 24 12:41:08 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Specify maven.compiler.release to fix build with jdk9+ and newer
maven-javadoc-plugin
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 12 17:45:45 UTC 2019 - Fridrich Strba <fstrba@suse.com> Tue Nov 12 17:45:45 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package jcsp # spec file for package jcsp
# #
# 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
@ -29,7 +29,8 @@ URL: https://github.com/codehaus/jcsp
# sh jcsp-create-tarball.sh < VERSION-TAG > # sh jcsp-create-tarball.sh < VERSION-TAG >
Source0: %{name}-%{namedversion}-clean.tar.xz Source0: %{name}-%{namedversion}-clean.tar.xz
Source1: %{name}-create-tarball.sh Source1: %{name}-create-tarball.sh
BuildRequires: maven-local fdupes BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.osgi:osgi.core)
BuildArch: noarch BuildArch: noarch
@ -119,7 +120,10 @@ rm -r src/org/jcsp/win32 \
%build %build
%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 %{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-Dmaven.compiler.release=6
%endif
%install %install
%mvn_install %mvn_install