Skip to content

Commit 52004b8

Browse files
committed
[OPENJDK-4029] move maven_init_var_MAVEN_SETTINGS_XML
Move the implementation of maven_init_var_MAVEN_SETTINGS_XML from modules/s2i/bash and replace the implementation in modules/maven/s2i Signed-off-by: Jonathan Dowland <[email protected]>
1 parent ac95f58 commit 52004b8

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ function maven_init_var_MAVEN_LOCAL_REPO() {
33
MAVEN_LOCAL_REPO="${MAVEN_LOCAL_REPO:-${_MAVEN_S2I_ARCHIVED_REPO}}"
44
}
55

6-
# Overrides basic functionality by looking fore settings.xml in <source>/configuration
6+
# if not already defined, look for settings.xml in <source>/configuration
77
function maven_init_var_MAVEN_SETTINGS_XML() {
88
if [ -f "${MAVEN_SETTINGS_XML}" ]; then
99
:
1010
elif [ -f "${S2I_SOURCE_DIR}/configuration/settings.xml" ]; then
11-
MAVEN_SETTINGS_XML="${HOME}/.m2/settings.xml"
12-
mkdir -p $(dirname "${MAVEN_SETTINGS_XML}")
13-
cp "${S2I_SOURCE_DIR}/configuration/settings.xml" "${MAVEN_SETTINGS_XML}"
14-
elif [ -f "${HOME}/.m2/settings.xml" ]; then
15-
MAVEN_SETTINGS_XML="${HOME}/.m2/settings.xml"
11+
MAVEN_SETTINGS_XML="${S2I_SOURCE_DIR}/configuration/settings.xml"
1612
else
1713
MAVEN_SETTINGS_XML="${_MAVEN_S2I_SETTINGS_XML}"
14+
mkdir -p $(dirname "${MAVEN_SETTINGS_XML}")
1815
cp "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/jboss-settings.xml" "${MAVEN_SETTINGS_XML}"
1916
fi
2017
}

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

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)