From 2d4adbcb91c35cd79d97ca8769eac96f1b944e3047931e7566e063f724598834 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 07:56:26 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/mojo-executor?expand=0&rev=3 --- mojo-executor.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mojo-executor.spec b/mojo-executor.spec index 5f44380..1472cb0 100644 --- a/mojo-executor.spec +++ b/mojo-executor.spec @@ -1,7 +1,7 @@ # # spec file for package mojo-executor # -# 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 @@ -25,16 +25,17 @@ Group: Development/Libraries/Java URL: http://timmoore.github.io/mojo-executor/ Source0: https://github.com/TimMoore/%{name}/archive/%{name}-parent-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0 -BuildRequires: maven-local fdupes +BuildRequires: fdupes +BuildRequires: maven-local +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) -BuildArch: noarch +BuildArch: noarch %description The Mojo Executor provides a way to to execute other Mojos (plugins) within a Maven plugin, @@ -56,7 +57,7 @@ perl -pi -e 's#org\.sonatype\.aether\.repository#org.eclipse.aether.repository#g mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MavenCompatibilityHelper.java %build -%mvn_build -f +%mvn_build -f -- -Dmaven.compiler.release=6 %install %mvn_install From 01632a6f930fd0ebfa01fff33c03e2cc1add4497eff6e0a8a0c08efbc75fb58c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 16:17:16 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/mojo-executor?expand=0&rev=4 --- mojo-executor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mojo-executor.spec b/mojo-executor.spec index 1472cb0..e8cf17c 100644 --- a/mojo-executor.spec +++ b/mojo-executor.spec @@ -57,7 +57,10 @@ perl -pi -e 's#org\.sonatype\.aether\.repository#org.eclipse.aether.repository#g mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MavenCompatibilityHelper.java %build -%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 e83b9b6193794ff9f88e4fbc51ad098cf0147b6d699f2146b92d170e8d8a5e74 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 23 Nov 2019 20:00:58 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/mojo-executor?expand=0&rev=5 --- mojo-executor-dependency.patch | 11 +++++++++++ mojo-executor-parent-2.3.0.tar.gz | 3 --- mojo-executor-parent-2.3.1.tar.gz | 3 +++ mojo-executor.spec | 9 ++++++--- 4 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 mojo-executor-dependency.patch delete mode 100644 mojo-executor-parent-2.3.0.tar.gz create mode 100644 mojo-executor-parent-2.3.1.tar.gz diff --git a/mojo-executor-dependency.patch b/mojo-executor-dependency.patch new file mode 100644 index 0000000..3c6c2fb --- /dev/null +++ b/mojo-executor-dependency.patch @@ -0,0 +1,11 @@ +--- mojo-executor-mojo-executor-parent-2.3.1/mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MojoExecutor.java 2019-11-23 20:33:23.082262552 +0100 ++++ mojo-executor-mojo-executor-parent-2.3.1/mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MojoExecutor.java 2019-11-23 20:32:56.434427749 +0100 +@@ -197,7 +197,7 @@ + * @return The plugin instance + */ + public static Plugin plugin(String groupId, String artifactId, String version) { +- return plugin(groupId, artifactId, version, Collections.emptyList()); ++ return plugin(groupId, artifactId, version, Collections.emptyList()); + } + + /** diff --git a/mojo-executor-parent-2.3.0.tar.gz b/mojo-executor-parent-2.3.0.tar.gz deleted file mode 100644 index db194c9..0000000 --- a/mojo-executor-parent-2.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24700406b15bb9d44a4b1bef44974d2336bf6bb403f3c072ee348467e160f58c -size 14657 diff --git a/mojo-executor-parent-2.3.1.tar.gz b/mojo-executor-parent-2.3.1.tar.gz new file mode 100644 index 0000000..d7bbdac --- /dev/null +++ b/mojo-executor-parent-2.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5556091119617dfe51d397efeea8d836a8caf8b4d8c6852df4e8dfd16889297 +size 15036 diff --git a/mojo-executor.spec b/mojo-executor.spec index e8cf17c..6155dc4 100644 --- a/mojo-executor.spec +++ b/mojo-executor.spec @@ -1,7 +1,7 @@ # # spec file for package mojo-executor # -# Copyright (c) 2019 SUSE LLC +# 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 @@ -17,7 +17,7 @@ Name: mojo-executor -Version: 2.3.0 +Version: 2.3.1 Release: 0 Summary: Mojo Executor License: Apache-2.0 @@ -25,6 +25,7 @@ Group: Development/Libraries/Java URL: http://timmoore.github.io/mojo-executor/ Source0: https://github.com/TimMoore/%{name}/archive/%{name}-parent-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0 +Patch0: mojo-executor-dependency.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -50,8 +51,10 @@ API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-parent-%{version} +%patch0 -p1 cp %{SOURCE1} . %pom_disable_module %{name}-maven-plugin +%pom_remove_plugin :jacoco-maven-plugin perl -pi -e 's#org\.sonatype\.aether\.repository#org.eclipse.aether.repository#g' \ mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MavenCompatibilityHelper.java @@ -59,7 +62,7 @@ perl -pi -e 's#org\.sonatype\.aether\.repository#org.eclipse.aether.repository#g %build %mvn_build -f \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -- -Dmaven.compiler.release=6 + -- -Dmaven.compiler.release=7 %endif %install From acfe02eb312e5e784199c5448ba93b50ee4dfa08317ac56bf8e6f2c3f43e2093 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 24 Nov 2019 16:53:41 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/mojo-executor?expand=0&rev=6 --- mojo-executor.changes | 11 +++++++++++ mojo-executor.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mojo-executor.changes b/mojo-executor.changes index a42029f..09b0c15 100644 --- a/mojo-executor.changes +++ b/mojo-executor.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Nov 24 16:51:15 UTC 2019 - Fridrich Strba + +- Upgrade to version 2.3.1 +- Added patch: + * mojo-executor-dependency.patch + + Collections.emptyList() has type of java.lang.Object and + cannot be cast to List. +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin + ------------------------------------------------------------------- Sat Nov 2 07:51:42 UTC 2019 - Fridrich Strba diff --git a/mojo-executor.spec b/mojo-executor.spec index 6155dc4..a6d2eec 100644 --- a/mojo-executor.spec +++ b/mojo-executor.spec @@ -1,7 +1,7 @@ # # spec file for package mojo-executor # -# Copyright (c) 2019 SUSE LLC. +# 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