pool/mojo-executor
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 750581 from Java:packages

Browse Source 
2.3.1

OBS-URL: https://build.opensuse.org/request/show/750581
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mojo-executor?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2019-11-26 15:58:56 +00:00 committed by Git OBS Bridge
commit 305968f9b8
5 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mojo-executor-dependency.patch Normal file
View 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());
}
/**

3
mojo-executor-parent-2.3.0.tar.gz
View File

@ -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
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f5556091119617dfe51d397efeea8d836a8caf8b4d8c6852df4e8dfd16889297
size 15036

11
mojo-executor.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Nov 24 16:51:15 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- 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<Dependency>.
- Specify maven.compiler.release to fix build with jdk9+ and newer
maven-javadoc-plugin
-------------------------------------------------------------------
Sat Nov 2 07:51:42 UTC 2019 - Fridrich Strba <fstrba@suse.com>

17
mojo-executor.spec
View File

@ -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
@ -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,11 +25,13 @@ 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
Patch0: mojo-executor-dependency.patch
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)
@ -49,14 +51,19 @@ 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
%build
%mvn_build -f
%mvn_build -f \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-- -Dmaven.compiler.release=7
%endif
%install
%mvn_install