diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch index e62d186..3b9b670 100644 --- a/0001-Adapt-mvn-script.patch +++ b/0001-Adapt-mvn-script.patch @@ -1,14 +1,14 @@ -From 9e51d86115b066cbf3d44392810b3f6fd63fdfc9 Mon Sep 17 00:00:00 2001 +From 056c94f86450c7c27f5bb11f98653c73bfe3d8e4 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 1 Feb 2017 14:54:26 +0100 Subject: [PATCH 1/4] Adapt mvn script --- - apache-maven/src/bin/mvn | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) + apache-maven/src/bin/mvn | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn -index a554c6617..818cf70b8 100755 +index a554c6617..0c07ba6e2 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -22,7 +22,7 @@ @@ -55,15 +55,6 @@ index a554c6617..818cf70b8 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 diff --git a/0002-Invoke-logback-via-reflection.patch b/0002-Invoke-logback-via-reflection.patch index 44c017e..863977d 100644 --- a/0002-Invoke-logback-via-reflection.patch +++ b/0002-Invoke-logback-via-reflection.patch @@ -1,4 +1,4 @@ -From 4fa2cfaa19a0752a656b2a223a77c3af25d2de12 Mon Sep 17 00:00:00 2001 +From 7610a10691e680db00edcbd4ce6767a30641cd71 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 diff --git a/0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch b/0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch index 47cc1bd..9986945 100644 --- a/0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch +++ b/0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch @@ -1,4 +1,4 @@ -From c533aada209c517c1666989d7115672e7522aa72 Mon Sep 17 00:00:00 2001 +From 56d10f48ebb2cdaf3882dc8afbef65a2ab529040 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 13 Oct 2018 04:16:44 +0200 Subject: [PATCH 3/4] [MNG-6642] Revert "[MNG-5995] Remove dependency to diff --git a/0004-Use-non-shaded-HTTP-wagon.patch b/0004-Use-non-shaded-HTTP-wagon.patch index 5b2dcd6..0ebea69 100644 --- a/0004-Use-non-shaded-HTTP-wagon.patch +++ b/0004-Use-non-shaded-HTTP-wagon.patch @@ -1,4 +1,4 @@ -From 59092ee77227c480d3665d62554f0f0023d8a6c7 Mon Sep 17 00:00:00 2001 +From c8933d155694ce37b1d4be59a744c8f7cbde6bb5 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