From 0ecc34333b7c5964e87a752ca5cff92d8be7f8f06456cf1447bbc4f1458523a8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 00:50:06 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker-plugin?expand=0&rev=5 --- maven-invoker-plugin-1.10-source-release.zip | 3 --- maven-invoker-plugin-3.2.1-source-release.zip | 3 +++ maven-invoker-plugin.changes | 5 +++++ maven-invoker-plugin.spec | 9 +++++---- 4 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 maven-invoker-plugin-1.10-source-release.zip create mode 100644 maven-invoker-plugin-3.2.1-source-release.zip diff --git a/maven-invoker-plugin-1.10-source-release.zip b/maven-invoker-plugin-1.10-source-release.zip deleted file mode 100644 index 12af148..0000000 --- a/maven-invoker-plugin-1.10-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ee840c0fb46866884328919fa7a8716321779a10301e62da7030e78ca74eb2d -size 494277 diff --git a/maven-invoker-plugin-3.2.1-source-release.zip b/maven-invoker-plugin-3.2.1-source-release.zip new file mode 100644 index 0000000..6c94f97 --- /dev/null +++ b/maven-invoker-plugin-3.2.1-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cb033f73fc20a51e1b74afb1e709898f6cc5b518e712c9d6109db7e154784d4 +size 640677 diff --git a/maven-invoker-plugin.changes b/maven-invoker-plugin.changes index 31b83e0..b247f5e 100644 --- a/maven-invoker-plugin.changes +++ b/maven-invoker-plugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 22 00:49:35 UTC 2019 - Fridrich Strba + +- Upgrade to upstream version 3.2.1 + ------------------------------------------------------------------- Sat Apr 6 12:07:07 UTC 2019 - Jan Engelhardt diff --git a/maven-invoker-plugin.spec b/maven-invoker-plugin.spec index 9e43f6e..5a7cfab 100644 --- a/maven-invoker-plugin.spec +++ b/maven-invoker-plugin.spec @@ -1,7 +1,7 @@ # # spec file for package maven-invoker-plugin # -# Copyright (c) 2018 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 @@ -18,7 +18,7 @@ %bcond_with groovy Name: maven-invoker-plugin -Version: 1.10 +Version: 3.2.1 Release: 0 Summary: Maven Invoker Plugin License: Apache-2.0 @@ -27,6 +27,7 @@ URL: http://maven.apache.org/plugins/maven-invoker-plugin/ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildRequires: fdupes BuildRequires: maven-local +BuildRequires: unzip BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) @@ -36,6 +37,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) +BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer) BuildRequires: mvn(org.apache.maven.shared:maven-invoker) BuildRequires: mvn(org.apache.maven.shared:maven-script-interpreter) BuildRequires: mvn(org.apache.maven:maven-artifact) @@ -49,7 +51,6 @@ BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-i18n) BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: unzip BuildArch: noarch %if %{with groovy} BuildRequires: mvn(org.codehaus.groovy:groovy) @@ -75,7 +76,7 @@ API documentation for %{name}. %endif %build -%{mvn_build} -f +%{mvn_build} -f -- -Dmaven.compiler.release=7 %install %mvn_install From 2e5b9cb3cf93c9fcf9a46626a67a7ed0b3734ea72575f0e18931d0b3cac87158 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 15:40:34 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker-plugin?expand=0&rev=6 --- maven-invoker-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-invoker-plugin.spec b/maven-invoker-plugin.spec index 5a7cfab..922868e 100644 --- a/maven-invoker-plugin.spec +++ b/maven-invoker-plugin.spec @@ -76,7 +76,10 @@ API documentation for %{name}. %endif %build -%{mvn_build} -f -- -Dmaven.compiler.release=7 +%{mvn_build} -f \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -- -Dmaven.compiler.release=7 +%endif %install %mvn_install