From 742f805177e3fafae61a760b570b5bb2825237b3 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dhyun@apple.com>
Date: Sun, 9 Jun 2019 08:33:21 -0700
Subject: [PATCH] Revert "[SPARK-27979][BUILD][test-maven] Remove deprecated
 `--force` option in `build/mvn` and `run-tests.py`"

This reverts commit 354ec254c564c6722e3eaaa69206c85c2019a48b.
---
 build/mvn        | 6 ++++++
 dev/run-tests.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/mvn b/build/mvn
index 75feb2f718d12..4cb10e0d03fa4 100755
--- a/build/mvn
+++ b/build/mvn
@@ -134,6 +134,12 @@ 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 7d7f7da4401ff..5211aea03ea49 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"), zinc_flag]
+    flags = [os.path.join(SPARK_HOME, "build", "mvn"), "--force", zinc_flag]
     run_cmd(flags + mvn_args)