You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2019/06/08 15:17:47 UTC

[spark] branch master updated: [SPARK-27979][BUILD][test-maven] Remove deprecated `--force` option in `build/mvn` and `run-tests.py`

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 354ec25  [SPARK-27979][BUILD][test-maven] Remove deprecated `--force` option in `build/mvn` and `run-tests.py`
354ec25 is described below

commit 354ec254c564c6722e3eaaa69206c85c2019a48b
Author: Dongjoon Hyun <dh...@apple.com>
AuthorDate: Sat Jun 8 08:17:12 2019 -0700

    [SPARK-27979][BUILD][test-maven] Remove deprecated `--force` option in `build/mvn` and `run-tests.py`
    
    ## What changes were proposed in this pull request?
    
    Since Apache Spark 2.0.0, SPARK-14867 deprecated `--force` option and made it ignored. This PR cleans up the related code completely at 3.0.0.
    
    **BEFORE (Jenkins)**
    ```
    ========================================================================
    Building Spark
    ========================================================================
    [info] Building Spark using Maven with these arguments:  -Phadoop-2.7 -Pkubernetes -Phive-thriftserver -Pkinesis-asl -Pyarn -Pspark-ganglia-lgpl -Phive -Pmesos clean package -DskipTests
    WARNING: '--force' is deprecated and ignored.
    ...
    ========================================================================
    Running Spark unit tests
    ========================================================================
    [info] Running Spark tests using Maven with these arguments:  -Phadoop-2.7 -Phive-thriftserver -Phive -Dtest.exclude.tags=org.apache.spark.tags.ExtendedHiveTest,org.apache.spark.tags.ExtendedYarnTest test --fail-at-end
    WARNING: '--force' is deprecated and ignored.
    ```
    
    **AFTER (Jenkins)**
    ```
    ========================================================================
    Building Spark
    ========================================================================
    [info] Building Spark using Maven with these arguments:  -Phadoop-2.7 -Pkubernetes -Phive-thriftserver -Pkinesis-asl -Pyarn -Pspark-ganglia-lgpl -Phive -Pmesos clean package -DskipTests
    ...
    ========================================================================
    Running Spark unit tests
    ========================================================================
    [info] Running Spark tests using Maven with these arguments:  -Phadoop-2.7 -Pkubernetes -Phive-thriftserver -Pyarn -Pspark-ganglia-lgpl -Phive -Pkinesis-asl -Pmesos -Dtest.exclude.tags=org.apache.spark.tags.ExtendedHiveTest,org.apache.spark.tags.ExtendedYarnTest test --fail-at-end
    ```
    
    ## How was this patch tested?
    
    Manually check the Jenkins logs.
    
    Closes #24824 from dongjoon-hyun/SPARK-27979.
    
    Authored-by: Dongjoon Hyun <dh...@apple.com>
    Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
 build/mvn        | 6 ------
 dev/run-tests.py | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/build/mvn b/build/mvn
index 4cb10e0..75feb2f 100755
--- a/build/mvn
+++ b/build/mvn
@@ -134,12 +134,6 @@ install_scala() {
 # the environment
 ZINC_PORT=${ZINC_PORT:-"3030"}
 
-# Remove `--force` for backward compatibility.
-if [ "$1" == "--force" ]; then
-  echo "WARNING: '--force' is deprecated and ignored."
-  shift
-fi
-
 # Install the proper version of Scala, Zinc and Maven for the build
 install_zinc
 install_scala
diff --git a/dev/run-tests.py b/dev/run-tests.py
index 5211aea..7d7f7da 100755
--- a/dev/run-tests.py
+++ b/dev/run-tests.py
@@ -240,7 +240,7 @@ def exec_maven(mvn_args=()):
     zinc_port = get_zinc_port()
     os.environ["ZINC_PORT"] = "%s" % zinc_port
     zinc_flag = "-DzincPort=%s" % zinc_port
-    flags = [os.path.join(SPARK_HOME, "build", "mvn"), "--force", zinc_flag]
+    flags = [os.path.join(SPARK_HOME, "build", "mvn"), zinc_flag]
     run_cmd(flags + mvn_args)
 
 


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