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

Accepting request 1086221 from Java:packages

Browse Source 
bsc#1211198

OBS-URL: https://build.opensuse.org/request/show/1086221
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2023-05-11 10:34:22 +00:00 committed by Git OBS Bridge
commit ccd8b9870a
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,38 +1,21 @@
From 8d6b4651e2be6156322d27d7c8715601a6b11cd2 Mon Sep 17 00:00:00 2001 From 6e8f6a1b27c09d0a84fb5f3b7269cf5840db04f8 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/4] Adapt mvn script
--- ---
apache-maven/src/bin/mvn | 17 ++++++++++------- apache-maven/src/bin/mvn | 19 ++++++++++++++++---
1 file changed, 10 insertions(+), 7 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 a3004f917..052df8f0c 100755 index dfa384b8e..8c03825ed 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 @@ @@ -38,12 +38,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
#
# Environment Variable Prerequisites
#
-# JAVA_HOME Must point at your Java Development Kit installation.
+# JAVA_HOME (Optional) Must point at your Java Development Kit installation.
# MAVEN_ARGS (Optional) Arguments passed to Maven before CLI arguments.
# MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
@@ -30,20 +30,22 @@
if [ -z "$MAVEN_SKIP_RC" ] ; then
- if [ -f /usr/local/etc/mavenrc ] ; then
- . /usr/local/etc/mavenrc
- fi
-
if [ -f /etc/mavenrc ] ; then
. /etc/mavenrc . /etc/mavenrc
fi fi
+ if [ -z "$JAVA_HOME" ] ; then + if [ -f /etc/java/maven.conf ] ; then
+ . /etc/java/maven.conf + . /etc/java/maven.conf
+ fi + fi
+ +
@ -42,12 +25,18 @@ index a3004f917..052df8f0c 100755
fi fi
+if [ -f /usr/share/java-utils/java-functions ] ; then
+ . /usr/share/java-utils/java-functions
+ set_jvm
+ set_javacmd
+fi
+export JAVA_HOME +export JAVA_HOME
+export JAVACMD
+ +
# OS specific support. $var _must_ be set to either true or false. # OS specific support. $var _must_ be set to either true or false.
cygwin=false; cygwin=false;
mingw=false; mingw=false;
@@ -68,7 +70,8 @@ done @@ -68,7 +80,8 @@ done
saveddir=`pwd` saveddir=`pwd`
@ -57,7 +46,7 @@ index a3004f917..052df8f0c 100755
# make it fully qualified # make it fully qualified
MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
@@ -106,7 +109,7 @@ if [ ! -x "$JAVACMD" ] ; then @@ -106,7 +119,7 @@ if [ ! -x "$JAVACMD" ] ; then
exit 1 exit 1
fi fi
@ -67,5 +56,5 @@ index a3004f917..052df8f0c 100755
# For Cygwin, switch paths to Windows format before running java # For Cygwin, switch paths to Windows format before running java
-- --
2.40.1 2.36.1

7
maven.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu May 11 08:39:04 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* 0001-Adapt-mvn-script.patch
+ revert to older version which worked well (bsc#1211198)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 3 11:44:20 UTC 2023 - Fridrich Strba <fstrba@suse.com> Wed May 3 11:44:20 UTC 2023 - Fridrich Strba <fstrba@suse.com>