From 78d492c1b153240dddc636ec6002e7bfc6b94b3b Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Sun, 11 Sep 2022 13:40:07 +0300 Subject: [PATCH] [SPARK-40396][BUILD] Update scalatest and scalatestplus related dependencies to use stable version ### What changes were proposed in this pull request? This pr update `scalatest` and `scalatestplus` related dependencies to use stable version as follows: - Upgrade `scala-xml` from 1.20 to `2.1.0` to support scalatest 3.2.13 - Update `org.scalatest:scalatest` from 3.3.0-SNAP3 to 3.2.13 - Update `org.scalatestplus:scalacheck-1-15:3.3.0-SNAP3` to `org.scalatestplus:scalacheck-1-16:3.2.13.0` and upgrade `scalacheck` from 1.15.4 to 1.16.0 - Update `org.scalatestplus:selenium-3-141:3.3.0.0-SNAP3` to `org.scalatestplus:selenium-3-141:3.2.10.0` and left TODO of SPARK-40397. ### Why are the changes needed? Change to use stable version dependencies. The relevant release notes as follows: - scala-xml: - https://github.com/scala/scala-xml/releases/tag/v1.3.0 - https://github.com/scala/scala-xml/releases/tag/v2.0.0 - https://github.com/scala/scala-xml/releases/tag/v2.0.1 - https://github.com/scala/scala-xml/releases/tag/v2.1.0 - scalatest : - https://github.com/scalatest/scalatest/releases/tag/release-3.2.10 - https://github.com/scalatest/scalatest/releases/tag/release-3.2.11 - https://github.com/scalatest/scalatest/releases/tag/release-3.2.12 - https://github.com/scalatest/scalatest/releases/tag/release-3.2.13 - org.scalatestplus:scalacheck: - https://github.com/scalatest/scalatestplus-scalacheck/releases/tag/release-3.2.10.0-for-scalacheck-1.15 - https://github.com/scalatest/scalatestplus-scalacheck/releases/tag/release-3.2.11.0-for-scalacheck-1.15 - https://github.com/scalatest/scalatestplus-scalacheck/releases/tag/release-3.2.12.0-for-scalacheck-1.16 - https://github.com/scalatest/scalatestplus-scalacheck/releases/tag/release-3.2.13.0-for-scalacheck-1.16 - org.scalatestplus:mockito: - https://github.com/scalatest/scalatestplus-mockito/releases/tag/release-3.2.13.0-for-mockito-4.6 - org.scalatestplus:selenium: - https://github.com/scalatest/scalatestplus-selenium/releases/tag/release-3.2.10.0-for-selenium-3.141 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? - Pass GitHub Actions - Manually check the problems mentioned in https://github.com/apache/spark/pull/35128/files ``` SPARK_GENERATE_GOLDEN_FILES=1 build/sbt clean "sql/testOnly *PlanStability*Suite" [info] Run completed in 52 seconds, 520 milliseconds. [info] Total number of tests run: 334 [info] Suites: completed 7, aborted 0 [info] Tests: succeeded 334, failed 0, canceled 0, ignored 0, pending 0 [info] All tests passed. ``` Closes #37842 from LuciferYang/SPARK-40396. Authored-by: yangjie01 Signed-off-by: Max Gekk --- dev/deps/spark-deps-hadoop-2-hive-2.3 | 2 +- dev/deps/spark-deps-hadoop-3-hive-2.3 | 2 +- pom.xml | 31 ++++++++++++++++----------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2-hive-2.3 b/dev/deps/spark-deps-hadoop-2-hive-2.3 index 8154bae6b778d..faf86376e9488 100644 --- a/dev/deps/spark-deps-hadoop-2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2-hive-2.3 @@ -241,7 +241,7 @@ scala-compiler/2.12.16//scala-compiler-2.12.16.jar scala-library/2.12.16//scala-library-2.12.16.jar scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar scala-reflect/2.12.16//scala-reflect-2.12.16.jar -scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar +scala-xml_2.12/2.1.0//scala-xml_2.12-2.1.0.jar shims/0.9.31//shims-0.9.31.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar snakeyaml/1.31//snakeyaml-1.31.jar diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 47bacaf33dd88..7a73deb019ac4 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -228,7 +228,7 @@ scala-compiler/2.12.16//scala-compiler-2.12.16.jar scala-library/2.12.16//scala-library-2.12.16.jar scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar scala-reflect/2.12.16//scala-reflect-2.12.16.jar -scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar +scala-xml_2.12/2.1.0//scala-xml_2.12-2.1.0.jar shims/0.9.31//shims-0.9.31.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar snakeyaml/1.31//snakeyaml-1.31.jar diff --git a/pom.xml b/pom.xml index b6d3134fa3440..0350ff793d2dd 100644 --- a/pom.xml +++ b/pom.xml @@ -398,12 +398,12 @@ org.scalatestplus - scalacheck-1-15_${scala.binary.version} + scalacheck-1-16_${scala.binary.version} test org.scalatestplus - mockito-4-5_${scala.binary.version} + mockito-4-6_${scala.binary.version} test @@ -1109,12 +1109,18 @@ org.scala-lang.modules scala-xml_${scala.binary.version} - 1.2.0 + 2.1.0 org.scala-lang scala-compiler ${scala.version} + + + org.scala-lang.modules + scala-xml_2.12 + + org.scala-lang @@ -1139,37 +1145,38 @@ org.scalatest scalatest_${scala.binary.version} - 3.3.0-SNAP3 + 3.2.13 test org.scalatestplus - scalacheck-1-15_${scala.binary.version} - 3.3.0.0-SNAP3 + scalacheck-1-16_${scala.binary.version} + 3.2.13.0 test org.scalatestplus - mockito-4-5_${scala.binary.version} - 3.2.12.0 + mockito-4-6_${scala.binary.version} + 3.2.13.0 test + org.scalatestplus selenium-3-141_${scala.binary.version} - 3.3.0.0-SNAP3 + 3.2.10.0 test org.mockito mockito-core - 4.5.1 + 4.6.1 test org.mockito mockito-inline - 4.5.1 + 4.6.1 test @@ -1181,7 +1188,7 @@ org.scalacheck scalacheck_${scala.binary.version} - 1.15.4 + 1.16.0 test