Skip to content

Commit e5d9511

Browse files
committed
[SPARK-27979][BUILD][test-maven] Remove deprecated --force option in build/mvn and run-tests.py
## What changes were proposed in this pull request? This is a second try of apache#24824. 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 apache#24833 from dongjoon-hyun/SPARK-FORCE-2. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent dbba3a3 commit e5d9511

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

build/mvn

-6
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,6 @@ install_scala() {
134134
# the environment
135135
ZINC_PORT=${ZINC_PORT:-"3030"}
136136

137-
# Remove `--force` for backward compatibility.
138-
if [ "$1" == "--force" ]; then
139-
echo "WARNING: '--force' is deprecated and ignored."
140-
shift
141-
fi
142-
143137
# Install the proper version of Scala, Zinc and Maven for the build
144138
install_zinc
145139
install_scala

dev/run-tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ def exec_maven(mvn_args=()):
240240
zinc_port = get_zinc_port()
241241
os.environ["ZINC_PORT"] = "%s" % zinc_port
242242
zinc_flag = "-DzincPort=%s" % zinc_port
243-
flags = [os.path.join(SPARK_HOME, "build", "mvn"), "--force", zinc_flag]
243+
flags = [os.path.join(SPARK_HOME, "build", "mvn"), zinc_flag]
244244
run_cmd(flags + mvn_args)
245245

246246

0 commit comments

Comments
 (0)