Skip to content

Commit 8c4b404

Browse files
committed
[OPENJDK-4029] Remove unused maven_init_var_MAVEN_SETTINGS_XML
This function is also defined in modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides, and it's that definition which we use in the OpenJDK images. Note that Wildfly are using the removed definition (in ubi9). Signed-off-by: Jonathan Dowland <[email protected]>
1 parent b674696 commit 8c4b404

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,6 @@ 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
7-
function maven_init_var_MAVEN_SETTINGS_XML() {
8-
if [ -f "${MAVEN_SETTINGS_XML}" ]; then
9-
:
10-
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"
16-
else
17-
MAVEN_SETTINGS_XML="${_MAVEN_S2I_SETTINGS_XML}"
18-
cp "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/jboss-settings.xml" "${MAVEN_SETTINGS_XML}"
19-
fi
20-
}
21-
226
# Overrides basic functionality by copying over archived maven repository
237
function maven_init_local_repo() {
248
# unpack artifacts from previous build

0 commit comments

Comments
 (0)