From 4f31a7551eeac3c3806baf14d477571d874b35327f69cd6301232eb34e1b5088 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 09:14:32 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jcsp?expand=0&rev=3 --- jcsp.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jcsp.spec b/jcsp.spec index df261a4..d261d7a 100644 --- a/jcsp.spec +++ b/jcsp.spec @@ -1,7 +1,7 @@ # # 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 # 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 > Source0: %{name}-%{namedversion}-clean.tar.xz 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.osgi:osgi.core) BuildArch: noarch @@ -119,7 +120,7 @@ rm -r src/org/jcsp/win32 \ %build -%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 +%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.compiler.release=6 %install %mvn_install From 725d5c7819d4bab97116b8687da6e4c25d9c4926740f88ee96b8626e2930c3fd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 15:13:47 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jcsp?expand=0&rev=4 --- jcsp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jcsp.spec b/jcsp.spec index d261d7a..2b452fc 100644 --- a/jcsp.spec +++ b/jcsp.spec @@ -120,7 +120,10 @@ rm -r src/org/jcsp/win32 \ %build -%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.compiler.release=6 +%{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 %mvn_install From e78740bb61169ba03fb93a4616b533052660a4db7a1205e83a4c2d7a7849be96 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 24 Nov 2019 12:41:22 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jcsp?expand=0&rev=5 --- jcsp.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jcsp.changes b/jcsp.changes index 1ce04c6..a3d1847 100644 --- a/jcsp.changes +++ b/jcsp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 24 12:41:08 UTC 2019 - Fridrich Strba + +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin + ------------------------------------------------------------------- Tue Nov 12 17:45:45 UTC 2019 - Fridrich Strba