Skip to content

[OPENJDK-4029] Remove unused maven_init_var_MAVEN_SETTINGS_XML #606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: ubi10
Choose a base branch
from
Open

[OPENJDK-4029] Remove unused maven_init_var_MAVEN_SETTINGS_XML #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac95f58
[OPENJDK-4029] remove unused definition of maven_init_var_MAVEN_SETTI…
jmtd Oct 16, 2025
52004b8
[OPENJDK-4029] move maven_init_var_MAVEN_SETTINGS_XML
jmtd Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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}"
}
Expand Down
9 changes: 3 additions & 6 deletions modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
12 changes: 0 additions & 12 deletions modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides
View file
Open in desktop

This file was deleted.

Loading