[incubator-celeborn] branch branch-0.3 updated: [CELEBORN-838] Add custom mvn flag to celeborn

[ch...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch branch-0.3
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git


The following commit(s) were added to refs/heads/branch-0.3 by this push:
     new 9b6d3dd14 [CELEBORN-838] Add custom mvn flag to celeborn
9b6d3dd14 is described below

commit 9b6d3dd141352146a7c6bea48110980e02465cca
Author: Aravind Patnam <ap...@linkedin.com>
AuthorDate: Wed Jul 26 09:51:30 2023 +0800

    [CELEBORN-838] Add custom mvn flag to celeborn
    
    ### What changes were proposed in this pull request?
    Add an option to pass in a custom maven installation, similar to how [Spark does it](https://github.com/apache/spark/blob/master/dev/make-distribution.sh#L65).
    
    ### Why are the changes needed?
    We need this internally as some of our machines may not have access to external Maven.
    
    ### Does this PR introduce _any_ user-facing change?
    No
    
    ### How was this patch tested?
    ran make-distribution.sh to make sure it worked.
    
    Closes #1761 from akpatnam25/CELEBORN-838.
    
    Authored-by: Aravind Patnam <ap...@linkedin.com>
    Signed-off-by: Cheng Pan <ch...@apache.org>
    (cherry picked from commit e708c3cd25269f860159ea6b36ab232a553574e3)
    Signed-off-by: Cheng Pan <ch...@apache.org>
---
 build/make-distribution.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build/make-distribution.sh b/build/make-distribution.sh
index 5aef54537..1b2037c9b 100755
--- a/build/make-distribution.sh
+++ b/build/make-distribution.sh
@@ -24,12 +24,13 @@ PROJECT_DIR="$(cd "`dirname "$0"`/.."; pwd)"
 DIST_DIR="$PROJECT_DIR/dist"
 NAME="bin"
 RELEASE="false"
+MVN="$PROJECT_DIR/build/mvn"
 
 function exit_with_usage {
   echo "make-distribution.sh - tool for making binary distributions of Celeborn"
   echo ""
   echo "usage:"
-  cl_options="[--name <custom_name>] [--release]"
+  cl_options="[--name <custom_name>] [--release] [--mvn <mvn-command>]"
   echo "make-distribution.sh $cl_options <maven build options>"
   echo ""
   exit 1
@@ -42,6 +43,10 @@ while (( "$#" )); do
       NAME="bin-$2"
       shift
       ;;
+    --mvn)
+      MVN="$2"
+      shift
+      ;;
     --release)
       RELEASE="true"
       ;;
@@ -86,7 +91,6 @@ if [ -z "$JAVA_HOME" ]; then
   exit -1
 fi
 
-MVN="$PROJECT_DIR/build/mvn"
 export MAVEN_OPTS="${MAVEN_OPTS:--Xmx2g -XX:ReservedCodeCacheSize=1g}"
 
 if [ ! "$(command -v "$MVN")" ] ; then