Hello community,
here is the log from the commit of package maven-invoker for openSUSE:Factory
checked in at 2019-11-26 16:59:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-invoker (Old)
and /work/SRC/openSUSE:Factory/.maven-invoker.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-invoker"
Tue Nov 26 16:59:00 2019 rev:2 rq:750584 version:3.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-invoker/maven-invoker.changes
2019-04-03 10:50:47.785921848 +0200
+++ /work/SRC/openSUSE:Factory/.maven-invoker.new.26869/maven-invoker.changes
2019-11-26 16:59:08.192112288 +0100
@@ -1,0 +2,9 @@
+Thu Nov 21 14:17:41 UTC 2019 - Fridrich Strba <fst...@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
+
+-------------------------------------------------------------------
Old:
----
maven-invoker-2.2-source-release.zip
New:
----
maven-invoker-3.0.1-source-release.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-invoker.spec ++++++
--- /var/tmp/diff_new_pack.oGMLqN/_old 2019-11-26 16:59:10.188111629 +0100
+++ /var/tmp/diff_new_pack.oGMLqN/_new 2019-11-26 16:59:10.192111628 +0100
@@ -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 @@
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 @@
%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
++++++ maven-invoker-MSHARED-279.patch ++++++
--- /var/tmp/diff_new_pack.oGMLqN/_old 2019-11-26 16:59:10.212111622 +0100
+++ /var/tmp/diff_new_pack.oGMLqN/_new 2019-11-26 16:59:10.212111622 +0100
@@ -13,14 +13,14 @@
---
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
++++++ maven-invoker-build.xml ++++++
--- /var/tmp/diff_new_pack.oGMLqN/_old 2019-11-26 16:59:10.224111617 +0100
+++ /var/tmp/diff_new_pack.oGMLqN/_new 2019-11-26 16:59:10.224111617 +0100
@@ -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>
