summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2023-09-03 17:31:45 +0200
committerGitHub <noreply@github.com>2023-09-03 17:31:45 +0200
commit73d9873465cab44e023f7970cc2e8a973bb56f57 (patch)
treeb2db496cf7a96a1a88213e205f356e8fcd54820e
parent66528789e10fae1f95ceecdfb4eddccad814d97f (diff)
parent94eafa3630637ffbdcd8416d556b206604cfd2a9 (diff)
Merge pull request #28360 from vespa-engine/use-mvnw-for-vespa
Use maven wrapper for bootstrap and vespa
-rwxr-xr-xbootstrap.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index e6d61e7c7a5..d6a34fdb834 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -36,9 +36,7 @@ get_env_var_with_optional_default() {
fi
}
-# TODO: use maven-wrapper after changing mvn command for vespa in factory/build-java.sh
-#readonly MAVEN_CMD=$(get_env_var_with_optional_default VESPA_MAVEN_COMMAND "$(pwd)/mvnw")
-readonly MAVEN_CMD=$(get_env_var_with_optional_default VESPA_MAVEN_COMMAND mvn)
+readonly MAVEN_CMD=$(get_env_var_with_optional_default VESPA_MAVEN_COMMAND "$(pwd)/mvnw")
readonly MAVEN_EXTRA_OPTS=$(get_env_var_with_optional_default VESPA_MAVEN_EXTRA_OPTS)
echo "Using maven command: ${MAVEN_CMD}"