pool/maven-invoker
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=6

Browse Source
This commit is contained in:
Fridrich Strba 2019-11-21 14:18:48 +00:00 committed by Git OBS Bridge
parent 47d1104da1
commit 8b53ed9dfc
6 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-invoker-2.2-source-release.zip
View File

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

3
maven-invoker-3.0.1-source-release.zip Normal file
View File

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

16
maven-invoker-MSHARED-279.patch
View File

@ -13,14 +13,14 @@ index 35ab16b..082c988 100644
--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
+++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
@@ -536,7 +536,7 @@ public class MavenCommandLineBuilder
if ( mavenHome == null )
{
String mavenHomeProperty = System.getProperty( "maven.home" );
- if ( mavenHomeProperty != null )
+ if ( StringUtils.isNotEmpty( mavenHomeProperty ) )
{
mavenHome = new File( mavenHomeProperty );
if ( !mavenHome.isDirectory() )
if ( mavenHome == null )
{
String mavenHomeProperty = System.getProperty( "maven.home" );
- if ( mavenHomeProperty != null )
+ if ( StringUtils.isNotEmpty( mavenHomeProperty ) )
{
mavenHome = new File( mavenHomeProperty );
if ( !mavenHome.isDirectory() )
--
1.8.1.4

5
maven-invoker-build.xml
View File

@ -10,7 +10,7 @@
<property name="project.groupId" value="org.apache.maven.shared"/>
<property name="project.artifactId" value="maven-invoker"/>
<property name="project.version" value="2.2"/>
<property name="project.version" value="3.0.1"/>
<property name="project.name" value="Apache Maven Invoker"/>
<property name="project.organization.name" value="The Apache Software Foundation"/>
@ -34,14 +34,11 @@
<path id="build.classpath">
<fileset dir="lib">
<!-- plexus-utils-3.0.20 plexus-component-annotations-1.6 -->
<include name="**/*.jar"/>
</fileset>
</path>
<path id="build.test.classpath">
<fileset dir="lib">
<!-- plexus-utils-3.0.20 plexus-component-annotations-1.6
junit-4.11 hamcrest-core-1.3.jar -->
<include name="**/*.jar"/>
</fileset>
</path>

9
maven-invoker.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Nov 21 14:17:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 3.0.1
* needed by xmvn-tools >= 3.1.0
- Modified patch:
* maven-invoker-MSHARED-279.patch
+ rediff to changed context
-------------------------------------------------------------------
Mon Apr 1 23:01:37 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

8
maven-invoker.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package maven-invoker
#
# 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
@ -18,7 +18,7 @@
%bcond_with tests
Name: maven-invoker
Version: 2.2
Version: 3.0.1
Release: 0
Summary: An API for firing a maven build in a clean environment
License: Apache-2.0
@ -31,10 +31,12 @@ Patch1: %{name}-MSHARED-279.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: maven-shared-utils
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils
BuildRequires: unzip
Requires: mvn(org.apache.maven.shared:maven-shared-utils)
Requires: mvn(org.codehaus.plexus:plexus-component-annotations)
Requires: mvn(org.codehaus.plexus:plexus-utils)
BuildArch: noarch
@ -73,7 +75,7 @@ cp %{SOURCE1} build.xml
%build
mkdir -p lib
build-jar-repository -s lib plexus/utils plexus-containers/plexus-component-annotations
build-jar-repository -s lib plexus/utils plexus-containers/plexus-component-annotations maven-shared-utils/maven-shared-utils
%if %{with tests}
export M2_HOME=%{_datadir}/xmvn
%endif