From 2eaf9c3f599dbbc959c562c444fb2bdff0bc79a0056c39266a7c4776b4ce524d Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 21 Nov 2019 17:33:32 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=8

---
 0001-Adapt-mvn-script.patch | 21 +++++++++++++++------
 maven.changes               |  3 +--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch
index 80246e1..e8625cf 100644
--- a/0001-Adapt-mvn-script.patch
+++ b/0001-Adapt-mvn-script.patch
@@ -1,14 +1,14 @@
-From 056c94f86450c7c27f5bb11f98653c73bfe3d8e4 Mon Sep 17 00:00:00 2001
+From 46041685a82b861bc8616bb603e341adb740a302 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Wed, 1 Feb 2017 14:54:26 +0100
-Subject: [PATCH 1/4] Adapt mvn script
+Subject: [PATCH 1/3] Adapt mvn script
 
 ---
- apache-maven/src/bin/mvn | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
+ apache-maven/src/bin/mvn | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
-index a554c6617..0c07ba6e2 100755
+index a554c66..818cf70 100755
 --- a/apache-maven/src/bin/mvn
 +++ b/apache-maven/src/bin/mvn
 @@ -22,7 +22,7 @@
@@ -55,6 +55,15 @@ index a554c6617..0c07ba6e2 100755
  
  # make it fully qualified
  MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
+@@ -102,7 +115,7 @@ if [ ! -x "$JAVACMD" ] ; then
+   exit 1
+ fi
+ 
+-CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
++CLASSWORLDS_JAR=`build-classpath plexus-classworlds`
+ CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+ 
+ # For Cygwin, switch paths to Windows format before running java
 -- 
-2.21.0
+2.17.1
 
diff --git a/maven.changes b/maven.changes
index 9108885..ded6394 100644
--- a/maven.changes
+++ b/maven.changes
@@ -2,8 +2,7 @@
 Thu Nov 21 15:53:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
 - Upgrade to upstream version 3.6.1
-- Modified patches:
-  * 0001-Adapt-mvn-script.patch
+- Modified patche:
   * 0002-Invoke-logback-via-reflection.patch
     + adapt to changed context
 - Removed patch: