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

2023-05-11 08:47:09 +00:00 · 2023-05-11 08:47:09 +00:00 · c810802196
commit c810802196
parent 10440e6746
2 changed files with 9 additions and 1 deletions
--- 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
 +
--- a/maven.changes
+++ b/maven.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu May 11 08:39:04 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- 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 <fstrba@suse.com>