From 57274b45951f43febc5ad79dec70c8939020eb16c59431f77beb18efb76204a5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 00:53:06 +0000 Subject: [PATCH 1/3] Accepting request 750207 from Java:packages OBS-URL: https://build.opensuse.org/request/show/750207 OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=15 --- maven-plugin-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-plugin-plugin.spec b/maven-plugin-plugin.spec index dde3806..61ff6a6 100644 --- a/maven-plugin-plugin.spec +++ b/maven-plugin-plugin.spec @@ -133,7 +133,7 @@ API documentation for %{name}. %build pushd %{name} %{mvn_file} :%{name} %{base_name}/%{name} -%{mvn_build} -f -- -Dmaven.compiler.source=6 -Dmaven.compiler.target=6 +%{mvn_build} -f -- -Dmaven.compiler.release=6 popd %install From 03130ed9dc28ed82509191fd588d1f6314d84a484ed5398edc07624765c6b734 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 16:45:04 +0000 Subject: [PATCH 2/3] Accepting request 750344 from Java:packages OBS-URL: https://build.opensuse.org/request/show/750344 OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=16 --- maven-plugin-plugin.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maven-plugin-plugin.spec b/maven-plugin-plugin.spec index 61ff6a6..c4baf5a 100644 --- a/maven-plugin-plugin.spec +++ b/maven-plugin-plugin.spec @@ -133,7 +133,11 @@ API documentation for %{name}. %build pushd %{name} %{mvn_file} :%{name} %{base_name}/%{name} -%{mvn_build} -f -- -Dmaven.compiler.release=6 +%{mvn_build} -f \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -- -Dmaven.compiler.release=6 +%endif + popd %install From bec7d3b4174b5cf4344719121ae00d7e26b85de2fcb5f2c2d62a9a01657f8e80 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 24 Nov 2019 17:31:25 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=17 --- maven-plugin-plugin-bootstrap.spec | 4 ++-- maven-plugin-plugin.changes | 6 ++++++ maven-plugin-plugin.spec | 2 +- maven-plugin-tools.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/maven-plugin-plugin-bootstrap.spec b/maven-plugin-plugin-bootstrap.spec index 2d9d1b6..25bebba 100644 --- a/maven-plugin-plugin-bootstrap.spec +++ b/maven-plugin-plugin-bootstrap.spec @@ -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 # remain the property of their copyright owners, unless otherwise agreed diff --git a/maven-plugin-plugin.changes b/maven-plugin-plugin.changes index a0a12b3..5e59793 100644 --- a/maven-plugin-plugin.changes +++ b/maven-plugin-plugin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 24 17:30:49 UTC 2019 - Fridrich Strba + +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin + ------------------------------------------------------------------- Wed Apr 3 09:16:17 UTC 2019 - Fridrich Strba diff --git a/maven-plugin-plugin.spec b/maven-plugin-plugin.spec index c4baf5a..d30f9a0 100644 --- a/maven-plugin-plugin.spec +++ b/maven-plugin-plugin.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 8cc68a7..29c61b2 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed