From e7dd6b1a276d364bd28bdfe8668eda9d464f37ab7704eafd19c340da638e609c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 21 Nov 2019 23:32:57 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resources-plugin?expand=0&rev=9 --- maven-resources-plugin.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec index e492d61..07aa995 100644 --- a/maven-resources-plugin.spec +++ b/maven-resources-plugin.spec @@ -1,7 +1,7 @@ # -# spec file for package maven +# spec file for package maven-resources-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 @@ -105,7 +105,7 @@ build-jar-repository -s lib \ %else xmvn --batch-mode --offline \ -Dmaven.test.skip=true \ - package org.apache.maven.plugins:maven-javadoc-plugin:aggregate + package %endif %{mvn_artifact} pom.xml target/%{base_name}-%{version}.jar @@ -117,9 +117,9 @@ xmvn --batch-mode --offline \ %files -f .mfiles %license LICENSE NOTICE -%if %{without bootstrap} -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE -%endif +#%if %{without bootstrap} +#%files javadoc -f .mfiles-javadoc +#%license LICENSE NOTICE +#%endif %changelog From 589bdfb9aea92ea9c82b2c0f988c062a88daaedfb4f694032e4d0207c08fcd70 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 00:25:07 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resources-plugin?expand=0&rev=10 --- maven-resources-plugin.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec index 07aa995..aa4a546 100644 --- a/maven-resources-plugin.spec +++ b/maven-resources-plugin.spec @@ -104,8 +104,8 @@ build-jar-repository -s lib \ %{ant} -Dtest.skip=true jar %else xmvn --batch-mode --offline \ - -Dmaven.test.skip=true \ - package + -Dmaven.test.skip=true -Dmaven.compiler.release=7 \ + package org.apache.maven.plugins:maven-javadoc-plugin:aggregate %endif %{mvn_artifact} pom.xml target/%{base_name}-%{version}.jar @@ -117,9 +117,9 @@ xmvn --batch-mode --offline \ %files -f .mfiles %license LICENSE NOTICE -#%if %{without bootstrap} -#%files javadoc -f .mfiles-javadoc -#%license LICENSE NOTICE -#%endif +%if %{without bootstrap} +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE +%endif %changelog From 33eddb42b39083066195f85f186db7cc4c88921f3572962975bf14fa8d834095 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 15:58:19 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resources-plugin?expand=0&rev=11 --- maven-resources-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec index aa4a546..3730c89 100644 --- a/maven-resources-plugin.spec +++ b/maven-resources-plugin.spec @@ -104,7 +104,10 @@ build-jar-repository -s lib \ %{ant} -Dtest.skip=true jar %else xmvn --batch-mode --offline \ - -Dmaven.test.skip=true -Dmaven.compiler.release=7 \ + -Dmaven.test.skip=true \ +%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 4a7a1f6af1c389fc87013a81baa364efd5e5d1f9c71a017f7e21d85ee715bdda Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 24 Nov 2019 17:48:25 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resources-plugin?expand=0&rev=12 --- maven-resources-plugin.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-resources-plugin.changes b/maven-resources-plugin.changes index 6062e2e..e8ae581 100644 --- a/maven-resources-plugin.changes +++ b/maven-resources-plugin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 24 17:47:59 UTC 2019 - Fridrich Strba + +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin + ------------------------------------------------------------------- Wed Apr 3 09:27:51 UTC 2019 - Fridrich Strba