From faecd8f23d9839e425da98387ae87ce1bc9d3f47 Mon Sep 17 00:00:00 2001 From: liangbowen Date: Wed, 11 Jan 2023 16:08:12 +0800 Subject: [PATCH] [KYUUBI #4127] Align ScalaTest Plus plugin versions and bump ScalaTest from 3.2.9 to 3.2.15 ### _Why are the changes needed?_ - bump `ScalaTest` version from `3.2.9` to `3.2.15`, updated to use same scala version `2.12.17` in Kyuubi. (Release notes: https://github.com/scalatest/scalatest/releases/tag/release-3.2.15) - bump `scalatest-maven-plugin` from `2.0.2` to `2.2.0` (https://github.com/scalatest/scalatest-maven-plugin/releases/tag/release-2.2.0) - align `scalatestplus` versions to the version above, removing the misleading `scalacheck.version` property, (ScalaTest + ScalaCheck Version: https://www.scalatest.org/plus/scalacheck/versions) - bump scalatestplus plugins to `3.2.15.0` with bumping dependency - scalatestplus-scalacheck (https://github.com/scalatest/scalatestplus-scalacheck/releases/tag/release-3.2.15.0-for-scalacheck-1.17) - scalatestplus-mockito (https://github.com/scalatest/scalatestplus-mockito/releases/tag/release-3.2.15.0-for-mockito-4.6) - mockito from `3.4` to `4.6` (https://github.com/mockito/mockito/releases/tag/v4.6.0) - scalacheck from `1.15` to `1.17` (https://github.com/typelevel/scalacheck/releases/tag/v1.17.0) ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [ ] Add screenshots for manual tests if appropriate - [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #4127 from bowenliang123/scalatest-3.2.15. Closes #4127 ac661a55 [liangbowen] bump scalatest and plugin versions Authored-by: liangbowen Signed-off-by: Cheng Pan --- extensions/spark/kyuubi-extension-spark-3-1/pom.xml | 2 +- extensions/spark/kyuubi-extension-spark-3-2/pom.xml | 2 +- extensions/spark/kyuubi-extension-spark-3-3/pom.xml | 2 +- .../spark/kyuubi-extension-spark-common/pom.xml | 2 +- .../spark/kyuubi-spark-connector-common/pom.xml | 2 +- .../spark/kyuubi-spark-connector-hive/pom.xml | 2 +- .../spark/kyuubi-spark-connector-kudu/pom.xml | 2 +- .../spark/kyuubi-spark-connector-tpcds/pom.xml | 2 +- .../spark/kyuubi-spark-connector-tpch/pom.xml | 2 +- kyuubi-server/pom.xml | 2 +- pom.xml | 13 ++++++------- 11 files changed, 16 insertions(+), 17 deletions(-) diff --git a/extensions/spark/kyuubi-extension-spark-3-1/pom.xml b/extensions/spark/kyuubi-extension-spark-3-1/pom.xml index 6f1af08ca..5bd4b2fd5 100644 --- a/extensions/spark/kyuubi-extension-spark-3-1/pom.xml +++ b/extensions/spark/kyuubi-extension-spark-3-1/pom.xml @@ -85,7 +85,7 @@ org.scalatestplus - scalacheck-1-15_${scala.binary.version} + scalacheck-1-17_${scala.binary.version} test diff --git a/extensions/spark/kyuubi-extension-spark-3-2/pom.xml b/extensions/spark/kyuubi-extension-spark-3-2/pom.xml index 808ca35be..daab162b7 100644 --- a/extensions/spark/kyuubi-extension-spark-3-2/pom.xml +++ b/extensions/spark/kyuubi-extension-spark-3-2/pom.xml @@ -85,7 +85,7 @@ org.scalatestplus - scalacheck-1-15_${scala.binary.version} + scalacheck-1-17_${scala.binary.version} test diff --git a/extensions/spark/kyuubi-extension-spark-3-3/pom.xml b/extensions/spark/kyuubi-extension-spark-3-3/pom.xml index af444927d..cc8291213 100644 --- a/extensions/spark/kyuubi-extension-spark-3-3/pom.xml +++ b/extensions/spark/kyuubi-extension-spark-3-3/pom.xml @@ -85,7 +85,7 @@ org.scalatestplus - scalacheck-1-15_${scala.binary.version} + scalacheck-1-17_${scala.binary.version} test diff --git a/extensions/spark/kyuubi-extension-spark-common/pom.xml b/extensions/spark/kyuubi-extension-spark-common/pom.xml index 761c984b2..2c587fd78 100644 --- a/extensions/spark/kyuubi-extension-spark-common/pom.xml +++ b/extensions/spark/kyuubi-extension-spark-common/pom.xml @@ -71,7 +71,7 @@ org.scalatestplus - scalacheck-1-15_${scala.binary.version} + scalacheck-1-17_${scala.binary.version} test diff --git a/extensions/spark/kyuubi-spark-connector-common/pom.xml b/extensions/spark/kyuubi-spark-connector-common/pom.xml index 1b0e4b65f..e9fa8fcb4 100644 --- a/extensions/spark/kyuubi-spark-connector-common/pom.xml +++ b/extensions/spark/kyuubi-spark-connector-common/pom.xml @@ -84,7 +84,7 @@ org.scalatestplus - scalacheck-1-15_${scala.binary.version} + scalacheck-1-17_${scala.binary.version} test diff --git a/extensions/spark/kyuubi-spark-connector-hive/pom.xml b/extensions/spark/kyuubi-spark-connector-hive/pom.xml index 168bd18eb..a97dfa053 100644 --- a/extensions/spark/kyuubi-spark-connector-hive/pom.xml +++ b/extensions/spark/kyuubi-spark-connector-hive/pom.xml @@ -91,7 +91,7 @@ org.scalatestplus - scalacheck-1-15_${scala.binary.version} + scalacheck-1-17_${scala.binary.version} test diff --git a/extensions/spark/kyuubi-spark-connector-kudu/pom.xml b/extensions/spark/kyuubi-spark-connector-kudu/pom.xml index 06bcdf0c3..f3d667fce 100644 --- a/extensions/spark/kyuubi-spark-connector-kudu/pom.xml +++ b/extensions/spark/kyuubi-spark-connector-kudu/pom.xml @@ -75,7 +75,7 @@ org.scalatestplus - scalacheck-1-15_${scala.binary.version} + scalacheck-1-17_${scala.binary.version} test diff --git a/extensions/spark/kyuubi-spark-connector-tpcds/pom.xml b/extensions/spark/kyuubi-spark-connector-tpcds/pom.xml index f4cb8a093..53557aea3 100644 --- a/extensions/spark/kyuubi-spark-connector-tpcds/pom.xml +++ b/extensions/spark/kyuubi-spark-connector-tpcds/pom.xml @@ -90,7 +90,7 @@ org.scalatestplus - scalacheck-1-15_${scala.binary.version} + scalacheck-1-17_${scala.binary.version} test diff --git a/extensions/spark/kyuubi-spark-connector-tpch/pom.xml b/extensions/spark/kyuubi-spark-connector-tpch/pom.xml index f0580557c..4625cdf1a 100644 --- a/extensions/spark/kyuubi-spark-connector-tpch/pom.xml +++ b/extensions/spark/kyuubi-spark-connector-tpch/pom.xml @@ -89,7 +89,7 @@ org.scalatestplus - scalacheck-1-15_${scala.binary.version} + scalacheck-1-17_${scala.binary.version} test diff --git a/kyuubi-server/pom.xml b/kyuubi-server/pom.xml index 84901a866..748d8d028 100644 --- a/kyuubi-server/pom.xml +++ b/kyuubi-server/pom.xml @@ -469,7 +469,7 @@ org.scalatestplus - mockito-3-4_${scala.binary.version} + mockito-4-6_${scala.binary.version} test diff --git a/pom.xml b/pom.xml index 27cfd4776..b7da49088 100644 --- a/pom.xml +++ b/pom.xml @@ -177,9 +177,8 @@ 3.21.7 0.10.7 2.3.0 - 3.2.9.0 - 3.2.9 - 3.2.9.0 + 3.2.15 + 3.2.15.0 4.1.0 1.7.36 1.31 @@ -215,7 +214,7 @@ 1.6.1 4.6.1 3.0.0-M7 - 2.0.2 + 2.2.0 org.scalatest.tags.Slow,org.apache.kyuubi.tags.HudiTest 2.27.2 @@ -1051,14 +1050,14 @@ org.scalatestplus - scalacheck-1-15_${scala.binary.version} - ${scalacheck.version} + scalacheck-1-17_${scala.binary.version} + ${scalatestplus.version} test org.scalatestplus - mockito-3-4_${scala.binary.version} + mockito-4-6_${scala.binary.version} ${scalatestplus.version}