Skip to content

Commit ac95f58

Browse files
committed
[OPENJDK-4029] remove unused definition of maven_init_var_MAVEN_SETTINGS_XML
This implementation was not actually used by OpenJDK or Wildfly images. Signed-off-by: Jonathan Dowland <[email protected]>
1 parent a1da2dc commit ac95f58

File tree

1 file changed

+1
-11
lines changed
  • modules/maven/default/artifacts/opt/jboss/container/maven/default

1 file changed

+1
-11
lines changed

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function maven_init() {
1414
# initialize maven variables
1515
function maven_init_vars() {
1616
maven_init_var_MAVEN_LOCAL_REPO
17-
maven_init_var_MAVEN_SETTINGS_XML
17+
maven_init_var_MAVEN_SETTINGS_XML # must be defined by an accompanying cekit module
1818
maven_init_var_MAVEN_OPTS
1919
maven_init_var_MAVEN_ARGS
2020
}
@@ -23,16 +23,6 @@ function maven_init_var_MAVEN_LOCAL_REPO() {
2323
MAVEN_LOCAL_REPO="${MAVEN_LOCAL_REPO:-${HOME}/.m2/repository}"
2424
}
2525

26-
function maven_init_var_MAVEN_SETTINGS_XML() {
27-
if [ -f "${MAVEN_SETTINGS_XML}" ]; then
28-
:
29-
elif [ -f "${HOME}/.m2/settings.xml" ]; then
30-
MAVEN_SETTINGS_XML="${HOME}/.m2/settings.xml"
31-
else
32-
MAVEN_SETTINGS_XML="${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/jboss-settings.xml"
33-
fi
34-
}
35-
3626
function maven_init_var_MAVEN_OPTS() {
3727
export MAVEN_OPTS="${MAVEN_OPTS:-$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) -XX:MaxRAMPercentage=25.0}"
3828
}

0 commit comments

Comments
 (0)