This commit is contained in:
parent
01632a6f93
commit
e83b9b6193
11
mojo-executor-dependency.patch
Normal file
11
mojo-executor-dependency.patch
Normal file
@ -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.<Dependency>emptyList());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:24700406b15bb9d44a4b1bef44974d2336bf6bb403f3c072ee348467e160f58c
|
|
||||||
size 14657
|
|
3
mojo-executor-parent-2.3.1.tar.gz
Normal file
3
mojo-executor-parent-2.3.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f5556091119617dfe51d397efeea8d836a8caf8b4d8c6852df4e8dfd16889297
|
||||||
|
size 15036
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package mojo-executor
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: mojo-executor
|
Name: mojo-executor
|
||||||
Version: 2.3.0
|
Version: 2.3.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Mojo Executor
|
Summary: Mojo Executor
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -25,6 +25,7 @@ Group: Development/Libraries/Java
|
|||||||
URL: http://timmoore.github.io/mojo-executor/
|
URL: http://timmoore.github.io/mojo-executor/
|
||||||
Source0: https://github.com/TimMoore/%{name}/archive/%{name}-parent-%{version}.tar.gz
|
Source0: https://github.com/TimMoore/%{name}/archive/%{name}-parent-%{version}.tar.gz
|
||||||
Source1: http://www.apache.org/licenses/LICENSE-2.0
|
Source1: http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
Patch0: mojo-executor-dependency.patch
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
||||||
@ -50,8 +51,10 @@ API documentation for %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{name}-parent-%{version}
|
%setup -q -n %{name}-%{name}-parent-%{version}
|
||||||
|
%patch0 -p1
|
||||||
cp %{SOURCE1} .
|
cp %{SOURCE1} .
|
||||||
%pom_disable_module %{name}-maven-plugin
|
%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' \
|
perl -pi -e 's#org\.sonatype\.aether\.repository#org.eclipse.aether.repository#g' \
|
||||||
mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MavenCompatibilityHelper.java
|
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
|
%build
|
||||||
%mvn_build -f \
|
%mvn_build -f \
|
||||||
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
|
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
|
||||||
-- -Dmaven.compiler.release=6
|
-- -Dmaven.compiler.release=7
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
Loading…
Reference in New Issue
Block a user