From 30f090199e0c316f59627bd73e51d54dc941b8a9a9f4b236c9f7ac87024f1eb7 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 22 Oct 2021 09:58:18 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=30

---
 0001-Adapt-mvn-script.patch          | 6 +++---
 0004-Use-non-shaded-HTTP-wagon.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch
index e8625cf..d531bed 100644
--- a/0001-Adapt-mvn-script.patch
+++ b/0001-Adapt-mvn-script.patch
@@ -20,7 +20,7 @@ index a554c66..818cf70 100755
  #   MAVEN_OPTS      (Optional) Java runtime options used when Maven is executed.
  #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
  # -----------------------------------------------------------------------------
-@@ -33,12 +33,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
+@@ -37,12 +37,24 @@
      . /etc/mavenrc
    fi
  
@@ -45,7 +45,7 @@ index a554c66..818cf70 100755
  # OS specific support. $var _must_ be set to either true or false.
  cygwin=false;
  mingw=false;
-@@ -63,7 +75,8 @@ done
+@@ -67,7 +79,8 @@
  
  saveddir=`pwd`
  
@@ -55,7 +55,7 @@ index a554c66..818cf70 100755
  
  # make it fully qualified
  MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
-@@ -102,7 +115,7 @@ if [ ! -x "$JAVACMD" ] ; then
+@@ -105,7 +118,7 @@
    exit 1
  fi
  
diff --git a/0004-Use-non-shaded-HTTP-wagon.patch b/0004-Use-non-shaded-HTTP-wagon.patch
index d763aac..58c0c6e 100644
--- a/0004-Use-non-shaded-HTTP-wagon.patch
+++ b/0004-Use-non-shaded-HTTP-wagon.patch
@@ -38,7 +38,7 @@ diff --git a/pom.xml b/pom.xml
 index 237cdc39e..85436c54d 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -328,7 +328,6 @@ under the License.
+@@ -334,7 +334,6 @@
          <groupId>org.apache.maven.wagon</groupId>
          <artifactId>wagon-http</artifactId>
          <version>${wagonVersion}</version>