rpm/maven
SHA256
1
0
Fork 0
forked from pool/maven
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=8

Browse Source
This commit is contained in:
Fridrich Strba 2019-11-21 17:33:32 +00:00 committed by Git OBS Bridge
parent 6e76107918
commit 2eaf9c3f59
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
0001-Adapt-mvn-script.patch
View File

@ -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> From: Michael Simacek <msimacek@redhat.com>
Date: Wed, 1 Feb 2017 14:54:26 +0100 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 +++++++++++++++-- apache-maven/src/bin/mvn | 19 ++++++++++++++++---
1 file changed, 15 insertions(+), 2 deletions(-) 1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn 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 --- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
@ -55,6 +55,15 @@ index a554c6617..0c07ba6e2 100755
# make it fully qualified # make it fully qualified
MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
-- @@ -102,7 +115,7 @@ if [ ! -x "$JAVACMD" ] ; then
2.21.0 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.17.1

3
maven.changes
View File

@ -2,8 +2,7 @@
Thu Nov 21 15:53:17 UTC 2019 - Fridrich Strba <fstrba@suse.com> Thu Nov 21 15:53:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 3.6.1 - Upgrade to upstream version 3.6.1
- Modified patches: - Modified patche:
* 0001-Adapt-mvn-script.patch
* 0002-Invoke-logback-via-reflection.patch * 0002-Invoke-logback-via-reflection.patch
+ adapt to changed context + adapt to changed context
- Removed patch: - Removed patch: