From 2a1c83a45f1e3f842944a0a1a721b470ed94ef5593b16e559f3e46ff73696a3f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 07:47:20 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-reporting-exec?expand=0&rev=10 --- maven-reporting-exec.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-reporting-exec.spec b/maven-reporting-exec.spec index f6de067..79bb797 100644 --- a/maven-reporting-exec.spec +++ b/maven-reporting-exec.spec @@ -1,7 +1,7 @@ # # spec file for package maven-reporting-exec # -# 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,7 +75,7 @@ sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/* # Test are skipped because there are errors with PlexusLogger # More info possibly here: # https://docs.sonatype.org/display/AETHER/Using+Aether+in+Maven+Plugins?focusedCommentId=10485782#comment-10485782 -%{mvn_build} -f +%{mvn_build} -f -- -Dmaven.compiler.release=6 %install %mvn_install From 7f8dd73a09a8d5cea3d43655ea79fb2e3a58942ebd6350b1b9ec6b5613e43290 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 15:56:32 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-reporting-exec?expand=0&rev=11 --- maven-reporting-exec.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maven-reporting-exec.spec b/maven-reporting-exec.spec index 79bb797..5bfe3f7 100644 --- a/maven-reporting-exec.spec +++ b/maven-reporting-exec.spec @@ -72,10 +72,10 @@ sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/* %pom_change_dep org.sonatype.sisu:sisu-inject-plexus org.eclipse.sisu:org.eclipse.sisu.plexus %build -# Test are skipped because there are errors with PlexusLogger -# More info possibly here: -# https://docs.sonatype.org/display/AETHER/Using+Aether+in+Maven+Plugins?focusedCommentId=10485782#comment-10485782 -%{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 %install %mvn_install From 297887948bd6dbdda27907823fdf5f496278d89ea849b3d6305d3dc0fd5fa7c0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 24 Nov 2019 17:10:10 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-reporting-exec?expand=0&rev=12 --- maven-reporting-exec.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-reporting-exec.changes b/maven-reporting-exec.changes index 895c433..2f81495 100644 --- a/maven-reporting-exec.changes +++ b/maven-reporting-exec.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 24 17:09:42 UTC 2019 - Fridrich Strba + +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin + ------------------------------------------------------------------- Mon Jun 3 17:53:13 UTC 2019 - Jan Engelhardt