From c810802196df7e4fa96eec01e0ecfbbed82b24ee941a96437e06e6c57b02e4b3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 11 May 2023 08:47:09 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=69 --- 0001-Adapt-mvn-script.patch | 2 +- maven.changes | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch index 029cd29..129ee24 100644 --- a/0001-Adapt-mvn-script.patch +++ b/0001-Adapt-mvn-script.patch @@ -32,7 +32,7 @@ index a3004f917..052df8f0c 100755 . /etc/mavenrc fi -+ if [ -z "$JAVA_HOME" ] ; then ++ if [ -f /etc/java/maven.conf ] ; then + . /etc/java/maven.conf + fi + diff --git a/maven.changes b/maven.changes index 27891bf..a9ba034 100644 --- a/maven.changes +++ b/maven.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 11 08:39:04 UTC 2023 - Fridrich Strba + +- Modified patch: + * 0001-Adapt-mvn-script.patch + + check for existence of maven.conf before sourcing it + (bsc#1211198) + ------------------------------------------------------------------- Wed May 3 11:44:20 UTC 2023 - Fridrich Strba From d13c777c233df8e17081a997d081e7b8cf791fd022ee9a55fa93dd353b625df4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 11 May 2023 09:05:51 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=70 --- 0001-Adapt-mvn-script.patch | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch index 129ee24..c5107db 100644 --- a/0001-Adapt-mvn-script.patch +++ b/0001-Adapt-mvn-script.patch @@ -11,24 +11,7 @@ diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index a3004f917..052df8f0c 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn -@@ -22,7 +22,7 @@ - # - # 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 +@@ -37,12 +37,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then . /etc/mavenrc fi @@ -42,12 +25,18 @@ index a3004f917..052df8f0c 100755 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 JAVACMD + # OS specific support. $var _must_ be set to either true or false. cygwin=false; mingw=false; -@@ -68,7 +70,8 @@ done +@@ -67,7 +79,8 @@ done saveddir=`pwd` @@ -57,7 +46,7 @@ index a3004f917..052df8f0c 100755 # make it fully qualified MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` -@@ -106,7 +109,7 @@ if [ ! -x "$JAVACMD" ] ; then +@@ -105,7 +118,7 @@ if [ ! -x "$JAVACMD" ] ; then exit 1 fi From a47798828757c8fd90706f44099ee7fdf9208bac438a4a492cb94642c6ef8d96 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 11 May 2023 09:27:57 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=71 --- 0001-Adapt-mvn-script.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch index c5107db..d814dc4 100644 --- a/0001-Adapt-mvn-script.patch +++ b/0001-Adapt-mvn-script.patch @@ -1,14 +1,14 @@ -From 8d6b4651e2be6156322d27d7c8715601a6b11cd2 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/4] Adapt mvn script --- - apache-maven/src/bin/mvn | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) + 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 a3004f917..052df8f0c 100755 +index dfa384b8e..8c03825ed 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -37,12 +37,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then @@ -56,5 +56,5 @@ index a3004f917..052df8f0c 100755 # For Cygwin, switch paths to Windows format before running java -- -2.40.1 +2.36.1 From 9e313a809d5daa061b2ddd91dfb2716628c1dcd844ea99fcc12bab21f02ee978 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 11 May 2023 09:29:51 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=72 --- maven.changes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/maven.changes b/maven.changes index a9ba034..ffefcc0 100644 --- a/maven.changes +++ b/maven.changes @@ -3,8 +3,7 @@ Thu May 11 08:39:04 UTC 2023 - Fridrich Strba - Modified patch: * 0001-Adapt-mvn-script.patch - + check for existence of maven.conf before sourcing it - (bsc#1211198) + + revert to older version which worked well (bsc#1211198) ------------------------------------------------------------------- Wed May 3 11:44:20 UTC 2023 - Fridrich Strba From bad4983b27c98273e42fc789fc3b6715805cc266a94cf049d9c61510ee6eeec6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 11 May 2023 10:00:45 +0000 Subject: [PATCH 5/5] rediff patch to apply without leaving *.orig files OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=73 --- 0001-Adapt-mvn-script.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch index d814dc4..48bc3a3 100644 --- a/0001-Adapt-mvn-script.patch +++ b/0001-Adapt-mvn-script.patch @@ -11,7 +11,7 @@ diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index dfa384b8e..8c03825ed 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn -@@ -37,12 +37,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then +@@ -38,12 +38,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then . /etc/mavenrc fi @@ -36,7 +36,7 @@ index dfa384b8e..8c03825ed 100755 # OS specific support. $var _must_ be set to either true or false. cygwin=false; mingw=false; -@@ -67,7 +79,8 @@ done +@@ -68,7 +80,8 @@ done saveddir=`pwd` @@ -46,7 +46,7 @@ index dfa384b8e..8c03825ed 100755 # make it fully qualified MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` -@@ -105,7 +118,7 @@ if [ ! -x "$JAVACMD" ] ; then +@@ -106,7 +119,7 @@ if [ ! -x "$JAVACMD" ] ; then exit 1 fi