diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch index d531bed..c5935f8 100644 --- a/0001-Adapt-mvn-script.patch +++ b/0001-Adapt-mvn-script.patch @@ -1,14 +1,14 @@ -From 46041685a82b861bc8616bb603e341adb740a302 Mon Sep 17 00:00:00 2001 +From 6e8f6a1b27c09d0a84fb5f3b7269cf5840db04f8 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 1 Feb 2017 14:54:26 +0100 -Subject: [PATCH 1/3] Adapt mvn script +Subject: [PATCH 1/7] Adapt mvn script --- 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 a554c66..818cf70 100755 +index dfa384b8e..8c03825ed 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -22,7 +22,7 @@ @@ -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. # ----------------------------------------------------------------------------- -@@ -37,12 +37,24 @@ +@@ -37,12 +37,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then . /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; -@@ -67,7 +79,8 @@ +@@ -67,7 +79,8 @@ done saveddir=`pwd` @@ -55,7 +55,7 @@ index a554c66..818cf70 100755 # make it fully qualified MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` -@@ -105,7 +118,7 @@ +@@ -105,7 +118,7 @@ if [ ! -x "$JAVACMD" ] ; then exit 1 fi @@ -65,5 +65,5 @@ index a554c66..818cf70 100755 # For Cygwin, switch paths to Windows format before running java -- -2.17.1 +2.36.1 diff --git a/0002-Invoke-logback-via-reflection.patch b/0002-Invoke-logback-via-reflection.patch index 2843df5..f369689 100644 --- a/0002-Invoke-logback-via-reflection.patch +++ b/0002-Invoke-logback-via-reflection.patch @@ -1,7 +1,7 @@ -From 7610a10691e680db00edcbd4ce6767a30641cd71 Mon Sep 17 00:00:00 2001 +From 4d259917ec0a1e73a9bbf23e0737acd64727b802 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 6 Jun 2017 13:47:43 +0200 -Subject: [PATCH 2/4] Invoke logback via reflection +Subject: [PATCH 2/7] Invoke logback via reflection --- .../logging/impl/LogbackConfiguration.java | 19 ++++++++++++++----- @@ -49,5 +49,5 @@ index 5d9fab744..ced38cb5a 100644 @Override -- -2.21.0 +2.36.1 diff --git a/0004-Use-non-shaded-HTTP-wagon.patch b/0003-Use-non-shaded-HTTP-wagon.patch similarity index 80% rename from 0004-Use-non-shaded-HTTP-wagon.patch rename to 0003-Use-non-shaded-HTTP-wagon.patch index 58c0c6e..9af0268 100644 --- a/0004-Use-non-shaded-HTTP-wagon.patch +++ b/0003-Use-non-shaded-HTTP-wagon.patch @@ -1,7 +1,7 @@ -From c8933d155694ce37b1d4be59a744c8f7cbde6bb5 Mon Sep 17 00:00:00 2001 +From 507d1090563596d0752918ec3572a8c4a4130d2b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 09:51:56 +0200 -Subject: [PATCH 4/4] Use non-shaded HTTP wagon +Subject: [PATCH 3/7] Use non-shaded HTTP wagon --- apache-maven/pom.xml | 15 --------------- @@ -9,7 +9,7 @@ Subject: [PATCH 4/4] Use non-shaded HTTP wagon 2 files changed, 16 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml -index 2686570af..d22ae121d 100644 +index 7ff412767..b15091576 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -63,21 +63,6 @@ under the License. @@ -32,13 +32,13 @@ index 2686570af..d22ae121d 100644 - - -