Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven for openSUSE:Factory checked
in at 2023-05-11 12:34:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven (Old)
and /work/SRC/openSUSE:Factory/.maven.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven"
Thu May 11 12:34:22 2023 rev:16 rq:1086221 version:3.9.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven/maven.changes 2023-05-04
17:10:26.904320648 +0200
+++ /work/SRC/openSUSE:Factory/.maven.new.1533/maven.changes 2023-05-11
12:34:58.375141475 +0200
@@ -1,0 +2,7 @@
+Thu May 11 08:39:04 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Modified patch:
+ * 0001-Adapt-mvn-script.patch
+ + revert to older version which worked well (bsc#1211198)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ 0001-Adapt-mvn-script.patch ++++++
--- /var/tmp/diff_new_pack.wtmAFB/_old 2023-05-11 12:34:58.803143579 +0200
+++ /var/tmp/diff_new_pack.wtmAFB/_new 2023-05-11 12:34:58.807143599 +0200
@@ -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 <msima...@redhat.com>
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
-@@ -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
+@@ -38,12 +38,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
. /etc/mavenrc
fi
-+ if [ -z "$JAVA_HOME" ] ; then
++ if [ -f /etc/java/maven.conf ] ; then
+ . /etc/java/maven.conf
+ fi
+
@@ -42,12 +25,18 @@
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
+@@ -68,7 +80,8 @@ done
saveddir=`pwd`
@@ -57,7 +46,7 @@
# make it fully qualified
MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
-@@ -106,7 +109,7 @@ if [ ! -x "$JAVACMD" ] ; then
+@@ -106,7 +119,7 @@ if [ ! -x "$JAVACMD" ] ; then
exit 1
fi
@@ -67,6 +56,6 @@
# For Cygwin, switch paths to Windows format before running java
--
-2.40.1
+2.36.1
