Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-50299][BUILD] Upgrade jupiter-interface to 0.13.1 and Junit5 to 5.11.3 #48834

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,13 @@
<netty.version>4.1.114.Final</netty.version>
<netty-tcnative.version>2.0.69.Final</netty-tcnative.version>
<icu4j.version>76.1</icu4j.version>
<junit-jupiter.version>5.11.0</junit-jupiter.version>
<junit-platform.version>1.11.0</junit-platform.version>
<sbt-jupiter-interface.version>0.13.0</sbt-jupiter-interface.version>
<junit-jupiter.version>5.11.3</junit-jupiter.version>
<junit-platform.version>1.11.3</junit-platform.version>
<!--
SPARK-50299: When updating `sbt-jupiter-interface.version`,
also need to update the version in `SparkBuild.scala` and `plugins.sbt`.
-->
<sbt-jupiter-interface.version>0.13.1</sbt-jupiter-interface.version>
<!--
If you are changing Arrow version specification, please check
./python/pyspark/sql/pandas/utils.py, ./python/packaging/classic/setup.py
Expand Down
2 changes: 1 addition & 1 deletion project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1714,7 +1714,7 @@ object TestSettings {
(Test / testOptions) += Tests.Argument(TestFrameworks.ScalaTest, "-W", "120", "300"),
(Test / testOptions) += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
// Enable Junit testing.
libraryDependencies += "net.aichler" % "jupiter-interface" % "0.11.1" % "test",
libraryDependencies += "com.github.sbt.junit" % "jupiter-interface" % "0.13.1" % "test",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part was missed during the previous upgrade

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, nice catch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much for helping to fix it!
Additionally, can we replace this hard coded version parameter with SbtPomKeys.effectivePom.value.getProperties.get("sbt-jupiter-interface.version").asInstanceOf[String]? So next time if we only upgrade the version (without involving groupId or artifactId changes), we only need to update one place.

// `parallelExecutionInTest` controls whether test suites belonging to the same SBT project
// can run in parallel with one another. It does NOT control whether tests execute in parallel
// within the same JVM (which is controlled by `testForkedParallel`) or whether test cases
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.3")

addSbtPlugin("com.github.sbt" % "sbt-pom-reader" % "2.4.0")

addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.13.0")
addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.13.1")

addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7")