Merge pull request #606 from rh-openjdk/OPENJDK-4029-remove-overrides-ubi10

[OPENJDK-4029] Remove unused maven_init_var_MAVEN_SETTINGS_XML

Author: jmtd

modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh

@@ -14,7 +14,7 @@ function maven_init() {
 # initialize maven variables
 function maven_init_vars() {
   maven_init_var_MAVEN_LOCAL_REPO
-  maven_init_var_MAVEN_SETTINGS_XML
+  maven_init_var_MAVEN_SETTINGS_XML # must be defined by an accompanying cekit module
   maven_init_var_MAVEN_OPTS
   maven_init_var_MAVEN_ARGS
 }
@@ -23,16 +23,6 @@ function maven_init_var_MAVEN_LOCAL_REPO() {
   MAVEN_LOCAL_REPO="${MAVEN_LOCAL_REPO:-${HOME}/.m2/repository}"
 }
 
-function maven_init_var_MAVEN_SETTINGS_XML() {
-  if [ -f "${MAVEN_SETTINGS_XML}" ]; then
-    :
-  elif [ -f "${HOME}/.m2/settings.xml" ]; then
-    MAVEN_SETTINGS_XML="${HOME}/.m2/settings.xml"
-  else
-    MAVEN_SETTINGS_XML="${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/jboss-settings.xml"
-  fi
-}
-
 function maven_init_var_MAVEN_OPTS() {
   export MAVEN_OPTS="${MAVEN_OPTS:-$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) -XX:MaxRAMPercentage=25.0}"
 }

modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-overrides

@@ -3,18 +3,15 @@ function maven_init_var_MAVEN_LOCAL_REPO() {
   MAVEN_LOCAL_REPO="${MAVEN_LOCAL_REPO:-${_MAVEN_S2I_ARCHIVED_REPO}}"
 }
 
-# Overrides basic functionality by looking fore settings.xml in <source>/configuration
+# if not already defined, look for settings.xml in <source>/configuration
 function maven_init_var_MAVEN_SETTINGS_XML() {
   if [ -f "${MAVEN_SETTINGS_XML}" ]; then
     :
   elif [ -f "${S2I_SOURCE_DIR}/configuration/settings.xml" ]; then
-    MAVEN_SETTINGS_XML="${HOME}/.m2/settings.xml"
-    mkdir -p $(dirname "${MAVEN_SETTINGS_XML}")
-    cp "${S2I_SOURCE_DIR}/configuration/settings.xml" "${MAVEN_SETTINGS_XML}"
-  elif [ -f "${HOME}/.m2/settings.xml" ]; then
-    MAVEN_SETTINGS_XML="${HOME}/.m2/settings.xml"
+    MAVEN_SETTINGS_XML="${S2I_SOURCE_DIR}/configuration/settings.xml"
   else
     MAVEN_SETTINGS_XML="${_MAVEN_S2I_SETTINGS_XML}"
+    mkdir -p $(dirname "${MAVEN_SETTINGS_XML}")
     cp "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/jboss-settings.xml" "${MAVEN_SETTINGS_XML}"
   fi
 }