#31 Do not override JAVA_HOME set by user
Merged 7 months ago by mizdebsk. Opened 7 months ago by mizdebsk.
rpms/ mizdebsk/maven respect-java-home  into  rawhide

file modified
+4 -2
@@ -20,11 +20,13 @@ 

   #   MAVEN_OPTS      (Optional) Java runtime options used when Maven is executed.

   #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.

   # -----------------------------------------------------------------------------

- @@ -33,12 +33,16 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then

+ @@ -33,12 +33,18 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then

       . /etc/mavenrc

     fi

   

- +  . /etc/java/maven.conf

+ +  if [ -z "$JAVA_HOME" ] ; then

+ +    . /etc/java/maven.conf

+ +  fi

  +

     if [ -f "$HOME/.mavenrc" ] ; then

       . "$HOME/.mavenrc"

file modified
+5 -1
@@ -7,7 +7,7 @@ 

  Name:           maven

  Epoch:          1

  Version:        3.6.3

- Release:        13%{?dist}

+ Release:        14%{?dist}

  Summary:        Java project management and project comprehension tool

  # maven itself is ASL 2.0

  # bundled slf4j is MIT
@@ -291,6 +291,10 @@ 

  %config %{_javaconfdir}/maven.conf-openjdk17

  

  %changelog

+ * Fri Nov 05 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-14

+ - Do not override JAVA_HOME set by user

+ - Resolves: rhbz#2020478

+ 

  * Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-13

  - Suggest OpenJDK 17 as default Maven binding

  

User is always right. Respect user-set JAVA_HOME and do not override it.
Resolves https://bugzilla.redhat.com/show_bug.cgi?id=2020478

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Pull-Request has been merged by mizdebsk

7 months ago
Metadata