Skip to content

Commit

Permalink
Revert "[SPARK-27979][BUILD][test-maven] Remove deprecated --force
Browse files Browse the repository at this point in the history
…option in `build/mvn` and `run-tests.py`"

This reverts commit 354ec25.
  • Loading branch information
dongjoon-hyun committed Jun 9, 2019
1 parent f984f6a commit 742f805
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions build/mvn
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/run-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down

0 comments on commit 742f805

Please sign in to comment.