diff options
author | gjoranv <gjoranv@gmail.com> | 2023-08-25 16:29:49 +0200 |
---|---|---|
committer | gjoranv <gjoranv@gmail.com> | 2023-08-29 11:31:30 +0200 |
commit | b00f287f03884042788ba7f6b14710b5df18a5bd (patch) | |
tree | ec76c9d0306dfcbde4b0537d911393e7b223f448 /bootstrap.sh | |
parent | eb72c809f9ef74d8e300f21321486e8fe4f6b527 (diff) |
Set up maven-wrapper in bootstrap
Diffstat (limited to 'bootstrap.sh')
-rwxr-xr-x | bootstrap.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index e0dbfd33133..5c1953836ce 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -36,7 +36,10 @@ 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_EXTRA_OPTS=$(get_env_var_with_optional_default VESPA_MAVEN_EXTRA_OPTS) echo "Using maven command: ${MAVEN_CMD}" echo "Using maven extra opts: ${MAVEN_EXTRA_OPTS}" @@ -60,6 +63,11 @@ $top/dist/getversionmap.sh $top > $top/dist/vtag.map # The 'default' mode also builds some modules needed by C++ code. # The 'full' mode also builds modules needed by C++ tests. +# Set up maven wrapper and output maven version +echo "Setting up maven wrapper in $(pwd)" +mvn wrapper:wrapper -Dmaven=3.8.8 +${MAVEN_CMD} -v + # must install parent poms first: echo "Downloading all dependencies. This may take a few minutes with an empty Maven cache." ( |