From 208c0b7a569fe25c1c2bfd518a992b8bedc44aec8235873ae6be11ad33d18d5d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 21 Nov 2019 23:24:07 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-jar-plugin?expand=0&rev=14 --- maven-jar-plugin.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index fd6395a..c8ebf6f 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -1,7 +1,7 @@ # -# spec file for package maven +# spec file for package maven-jar-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 @@ -106,7 +106,7 @@ build-jar-repository -s lib \ %else xmvn --batch-mode --offline \ -Dmaven.test.skip=true -DmavenVersion=3.1.1 \ - package org.apache.maven.plugins:maven-javadoc-plugin:aggregate + package %endif %{mvn_artifact} pom.xml target/%{base_name}-%{version}.jar @@ -120,10 +120,10 @@ xmvn --batch-mode --offline \ %license LICENSE %doc NOTICE -%if %{without bootstrap} -%files javadoc -f .mfiles-javadoc -%license LICENSE -%doc NOTICE -%endif +#%if %{without bootstrap} +#%files javadoc -f .mfiles-javadoc +#%license LICENSE +#%doc NOTICE +#%endif %changelog From 654898297297b7e172feaa1e85ec761bbe1b0b4cdb97ed90c1ac9d2cbb31625d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 00:21:50 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-jar-plugin?expand=0&rev=15 --- maven-jar-plugin.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index c8ebf6f..7a3af55 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -105,8 +105,8 @@ build-jar-repository -s lib \ %{ant} -Dtest.skip=true jar %else xmvn --batch-mode --offline \ - -Dmaven.test.skip=true -DmavenVersion=3.1.1 \ - package + -Dmaven.test.skip=true -DmavenVersion=3.5.0 -Dmaven.compiler.release=7 \ + package org.apache.maven.plugins:maven-javadoc-plugin:aggregate %endif %{mvn_artifact} pom.xml target/%{base_name}-%{version}.jar @@ -120,10 +120,10 @@ xmvn --batch-mode --offline \ %license LICENSE %doc NOTICE -#%if %{without bootstrap} -#%files javadoc -f .mfiles-javadoc -#%license LICENSE -#%doc NOTICE -#%endif +%if %{without bootstrap} +%files javadoc -f .mfiles-javadoc +%license LICENSE +%doc NOTICE +%endif %changelog From 28ab6d5cdff6245f472d2a2546f380435cd96c392535391abe7b7dd87be4d2c4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 15:42:10 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-jar-plugin?expand=0&rev=16 --- maven-jar-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index 7a3af55..600b509 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -105,7 +105,10 @@ build-jar-repository -s lib \ %{ant} -Dtest.skip=true jar %else xmvn --batch-mode --offline \ - -Dmaven.test.skip=true -DmavenVersion=3.5.0 -Dmaven.compiler.release=7 \ + -Dmaven.test.skip=true -DmavenVersion=3.5.0 \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -Dmaven.compiler.release=7 \ +%endif package org.apache.maven.plugins:maven-javadoc-plugin:aggregate %endif From e84435e961aa2cd3d473fed5f4fa71889d1443e1eb83a9ab6fd925356989439c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 24 Nov 2019 17:45:59 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-jar-plugin?expand=0&rev=17 --- maven-jar-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index 600b509..1cbb87f 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -105,7 +105,7 @@ build-jar-repository -s lib \ %{ant} -Dtest.skip=true jar %else xmvn --batch-mode --offline \ - -Dmaven.test.skip=true -DmavenVersion=3.5.0 \ + -Dmaven.test.skip=true -DmavenVersion=3.1.1 \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} -Dmaven.compiler.release=7 \ %endif From ac7f3d2f0e00e7b5a122f78ff20bf552ddbd082e8ff809337c77cf46b994b350 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 24 Nov 2019 17:46:52 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-jar-plugin?expand=0&rev=18 --- maven-jar-plugin.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-jar-plugin.changes b/maven-jar-plugin.changes index 295a47c..da236e3 100644 --- a/maven-jar-plugin.changes +++ b/maven-jar-plugin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 24 17:46:08 UTC 2019 - Fridrich Strba + +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin + ------------------------------------------------------------------- Tue Oct 8 05:35:17 UTC 2019 - Fridrich Strba