diff --git a/maven-invoker-2.2-source-release.zip b/maven-invoker-2.2-source-release.zip deleted file mode 100644 index 28994af..0000000 --- a/maven-invoker-2.2-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f79d7c6f68a0b18c4f22972de340809ab73a127e4ce77fee041520e15afa46e6 -size 77611 diff --git a/maven-invoker-3.0.1-source-release.zip b/maven-invoker-3.0.1-source-release.zip new file mode 100644 index 0000000..fb2dfbe --- /dev/null +++ b/maven-invoker-3.0.1-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:067c02cf396a42388cb0804afcaf25225dd168526b2f283f2b4127de9002c33f +size 85361 diff --git a/maven-invoker-MSHARED-279.patch b/maven-invoker-MSHARED-279.patch index 79ba9b6..1faf608 100644 --- a/maven-invoker-MSHARED-279.patch +++ b/maven-invoker-MSHARED-279.patch @@ -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 diff --git a/maven-invoker-build.xml b/maven-invoker-build.xml index f8ac63e..b2bc2ac 100644 --- a/maven-invoker-build.xml +++ b/maven-invoker-build.xml @@ -10,7 +10,7 @@ - + @@ -34,14 +34,11 @@ - - diff --git a/maven-invoker.changes b/maven-invoker.changes index ea82db8..dff3a40 100644 --- a/maven-invoker.changes +++ b/maven-invoker.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Nov 21 14:17:41 UTC 2019 - Fridrich Strba + +- 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 diff --git a/maven-invoker.spec b/maven-invoker.spec index cb7fab2..6cb551c 100644 --- a/maven-invoker.spec +++ b/maven-invoker.spec @@ -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