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

dongjoon pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/branch-3.5 by this push:
     new 53a22c0c997a [SPARK-52568][BUILD][3.5] Fix `exec-maven-plugin` version 
used by `dev/test-dependencies.sh`
53a22c0c997a is described below

commit 53a22c0c997ae4e45f44202fd6317b8cab21867d
Author: Cheng Pan <cheng...@apache.org>
AuthorDate: Thu Jun 26 17:54:44 2025 -0700

    [SPARK-52568][BUILD][3.5] Fix `exec-maven-plugin` version used by 
`dev/test-dependencies.sh`
    
    Cherry-pick https://github.com/apache/spark/pull/51273 to branch 3.5
    
    ### What changes were proposed in this pull request?
    
    Fix `exec-maven-plugin` version used by `dev/test-dependencies.sh` to use 
the `exec-maven-plugin.version` defined in `pom.xml`, instead of the hardcoded 
old version(which does not work with Maven 4).
    
    ### Why are the changes needed?
    
    Keep toolchain version consistency, and prepare for Maven 4 support.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Run `./dev/test-dependencies.sh`
    ```
    ...
    ++ build/mvn help:evaluate -Dexpression=exec-maven-plugin.version -q 
-DforceStdout
    ++ grep -E '[0-9]+\.[0-9]+\.[0-9]+'
    Using `mvn` from path: 
/Users/chengpan/Projects/apache-spark-3.5/build/apache-maven-3.9.6/bin/mvn
    + MVN_EXEC_PLUGIN_VERSION=3.1.0
    + set +e
    ++ build/mvn -q -Dexec.executable=echo '-Dexec.args=${project.version}' 
--non-recursive org.codehaus.mojo:exec-maven-plugin:3.1.0:exec
    ...
    ```
    And pass GHA.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    No.
    
    Closes #51288 from pan3793/SPARK-52568-3.5.
    
    Authored-by: Cheng Pan <cheng...@apache.org>
    Signed-off-by: Dongjoon Hyun <dongj...@apache.org>
---
 dev/test-dependencies.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev/test-dependencies.sh b/dev/test-dependencies.sh
index 36cc7a4f994d..636ed0ffb0ca 100755
--- a/dev/test-dependencies.sh
+++ b/dev/test-dependencies.sh
@@ -37,6 +37,9 @@ HADOOP_HIVE_PROFILES=(
     hadoop-3-hive-2.3
 )
 
+MVN_EXEC_PLUGIN_VERSION=$(build/mvn help:evaluate \
+    -Dexpression=exec-maven-plugin.version -q -DforceStdout | grep -E 
"[0-9]+\.[0-9]+\.[0-9]+")
+
 # We'll switch the version to a temp. one, publish POMs using that new 
version, then switch back to
 # the old version. We need to do this because the `dependency:build-classpath` 
task needs to
 # resolve Spark's internal submodule dependencies.
@@ -47,7 +50,7 @@ OLD_VERSION=$($MVN -q \
     -Dexec.executable="echo" \
     -Dexec.args='${project.version}' \
     --non-recursive \
-    org.codehaus.mojo:exec-maven-plugin:1.6.0:exec | grep -E 
'[0-9]+\.[0-9]+\.[0-9]+')
+    org.codehaus.mojo:exec-maven-plugin:${MVN_EXEC_PLUGIN_VERSION}:exec | grep 
-E '[0-9]+\.[0-9]+\.[0-9]+')
 # dependency:get for guava and jetty-io are workaround for SPARK-37302.
 GUAVA_VERSION=$(build/mvn help:evaluate -Dexpression=guava.version -q 
-DforceStdout | grep -E "^[0-9.]+$")
 build/mvn dependency:get -Dartifact=com.google.guava:guava:${GUAVA_VERSION} -q
@@ -61,7 +64,7 @@ SCALA_BINARY_VERSION=$($MVN -q \
     -Dexec.executable="echo" \
     -Dexec.args='${scala.binary.version}' \
     --non-recursive \
-    org.codehaus.mojo:exec-maven-plugin:1.6.0:exec | grep -E '[0-9]+\.[0-9]+')
+    org.codehaus.mojo:exec-maven-plugin:${MVN_EXEC_PLUGIN_VERSION}:exec | grep 
-E '[0-9]+\.[0-9]+')
 if [[ "$SCALA_BINARY_VERSION" != "2.12" ]]; then
   echo "Skip dependency testing on $SCALA_BINARY_VERSION"
   exit 0


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to