From 52662c254eaed94bebaa1e9381b5cc42ee653d3d6c05876a23db912fc2dae670 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 21 Nov 2019 18:31:17 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/signpost-core?expand=0&rev=3 --- signpost-core.changes | 6 ++++++ signpost-core.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/signpost-core.changes b/signpost-core.changes index e43d69e..f094ff5 100644 --- a/signpost-core.changes +++ b/signpost-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 21 18:30:42 UTC 2019 - Fridrich Strba + +- Use default maven-compiler-plugin configuration to avoid 1.5 + as source/target levels + ------------------------------------------------------------------- Wed Nov 13 05:42:12 UTC 2019 - Fridrich Strba diff --git a/signpost-core.spec b/signpost-core.spec index 6f129cf..e630b0b 100644 --- a/signpost-core.spec +++ b/signpost-core.spec @@ -1,7 +1,7 @@ # # spec file for package signpost-core # -# 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 @@ -75,6 +75,9 @@ sed -i 's/\r//' LICENSE %pom_remove_plugin -r :maven-antrun-plugin %pom_remove_plugin -r :maven-release-plugin +# Use a default configuration to avoid 1.5 as source/target levels +%pom_remove_plugin :maven-compiler-plugin + %{mvn_file} :%{name} %{name} %{mvn_file} :signpost-commonshttp4 signpost-commonshttp4 From 7fbc67d9501f4df56733156f1058e2816a5cb1140b4c625dd9be593df22f1110 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 07:15:41 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/signpost-core?expand=0&rev=4 --- signpost-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/signpost-core.spec b/signpost-core.spec index e630b0b..0633797 100644 --- a/signpost-core.spec +++ b/signpost-core.spec @@ -82,7 +82,7 @@ sed -i 's/\r//' LICENSE %{mvn_file} :signpost-commonshttp4 signpost-commonshttp4 %build -%{mvn_build} -s -f -- -Dsource=6 +%{mvn_build} -s -f -- -Dmaven.compiler.release=6 %install %mvn_install From 88e68dcbbbeb424514b8aaad1aa984d82eaa69779a3fc03c804cd212fe80d7c9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 16:32:16 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/signpost-core?expand=0&rev=5 --- signpost-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/signpost-core.spec b/signpost-core.spec index 0633797..cb366cb 100644 --- a/signpost-core.spec +++ b/signpost-core.spec @@ -82,7 +82,10 @@ sed -i 's/\r//' LICENSE %{mvn_file} :signpost-commonshttp4 signpost-commonshttp4 %build -%{mvn_build} -s -f -- -Dmaven.compiler.release=6 +%{mvn_build} -s -f \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -- -Dmaven.compiler.release=6 +%endif %install %mvn_install From 278bb1e2325f32007cab90e4824763a98ed6fb3cdbba47acab426626ea404947 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 24 Nov 2019 12:07:46 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/signpost-core?expand=0&rev=6 --- signpost-core.changes | 4 ++-- signpost-core.spec | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/signpost-core.changes b/signpost-core.changes index f094ff5..48f0955 100644 --- a/signpost-core.changes +++ b/signpost-core.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Thu Nov 21 18:30:42 UTC 2019 - Fridrich Strba -- Use default maven-compiler-plugin configuration to avoid 1.5 - as source/target levels +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin ------------------------------------------------------------------- Wed Nov 13 05:42:12 UTC 2019 - Fridrich Strba diff --git a/signpost-core.spec b/signpost-core.spec index cb366cb..5b87195 100644 --- a/signpost-core.spec +++ b/signpost-core.spec @@ -75,9 +75,6 @@ sed -i 's/\r//' LICENSE %pom_remove_plugin -r :maven-antrun-plugin %pom_remove_plugin -r :maven-release-plugin -# Use a default configuration to avoid 1.5 as source/target levels -%pom_remove_plugin :maven-compiler-plugin - %{mvn_file} :%{name} %{name} %{mvn_file} :signpost-commonshttp4 signpost-commonshttp4