(celeborn) branch branch-0.6 updated: [CELEBORN-1413][FOLLOWUP] Check JAVA_HOME variables for release

[feiwang]

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

feiwang pushed a commit to branch branch-0.6
in repository https://gitbox.apache.org/repos/asf/celeborn.git


The following commit(s) were added to refs/heads/branch-0.6 by this push:
     new 5d19b3810 [CELEBORN-1413][FOLLOWUP] Check JAVA_HOME variables for 
release
5d19b3810 is described below

commit 5d19b3810c7176a8a9e86497e1f858569be7797b
Author: Wang, Fei <fwan...@ebay.com>
AuthorDate: Mon Jun 16 21:10:54 2025 -0700

    [CELEBORN-1413][FOLLOWUP] Check JAVA_HOME variables for release
    
    ### What changes were proposed in this pull request?
    For release mode, check the JAVA_HOME variables and set JDK version to 8 by 
default
    
    ```
    ./build/make-distribution.sh --sbt-enabled --release
    ```
    
    ### Why are the changes needed?
    
    1. Address comments: 
https://github.com/apache/celeborn/pull/3282#discussion_r2149146734
    2. Set JDK 8 for release mode by default is necessary
    ### Does this PR introduce _any_ user-facing change?
    No.
    
    ### How was this patch tested?
    
    Manual test.
    
    Closes #3331 from turboFei/JAVA_HOME.
    
    Authored-by: Wang, Fei <fwan...@ebay.com>
    Signed-off-by: Wang, Fei <fwan...@ebay.com>
    (cherry picked from commit 6f1c10527f1eacb4ee528c7da6db3b7371695000)
    Signed-off-by: Wang, Fei <fwan...@ebay.com>
---
 build/make-distribution.sh | 8 ++++++++
 build/release/release.sh   | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/build/make-distribution.sh b/build/make-distribution.sh
index b78a7083a..3a9a688dc 100755
--- a/build/make-distribution.sh
+++ b/build/make-distribution.sh
@@ -73,6 +73,14 @@ while (( "$#" )); do
   shift
 done
 
+if [ "$RELEASE" == "true" ]; then
+  JAVA8_HOME=${JAVA8_HOME:?"JAVA8_HOME is required"}
+  JAVA11_HOME=${JAVA11_HOME:?"JAVA11_HOME is required"}
+  JAVA17_HOME=${JAVA17_HOME:?"JAVA17_HOME is required"}
+  # Set JAVA_HOME to JDK 8 by default for release
+  export JAVA_HOME=$JAVA8_HOME
+fi
+
 if [ -z "$JAVA_HOME" ]; then
   # Fall back on JAVA_HOME from rpm, if found
   if [ $(command -v rpm) ]; then
diff --git a/build/release/release.sh b/build/release/release.sh
index 37a6bb066..6eb11921a 100755
--- a/build/release/release.sh
+++ b/build/release/release.sh
@@ -29,6 +29,8 @@ RELEASE_RC_NO=${RELEASE_RC_NO:?"RELEASE_RC_NO is required, 
e.g. 0"}
 JAVA8_HOME=${JAVA8_HOME:?"JAVA8_HOME is required"}
 JAVA11_HOME=${JAVA11_HOME:?"JAVA11_HOME is required"}
 JAVA17_HOME=${JAVA17_HOME:?"JAVA17_HOME is required"}
+# Set JAVA_HOME to JDK 8 by default for release
+export JAVA_HOME=$JAVA8_HOME
 
 RELEASE_VERSION=$(awk -F'"' '/ThisBuild \/ version/ {print $2}' version.sbt)