Skip to content

Commit a57465a

Browse files
add java 17 test options for sharing module
GitOrigin-RevId: 25b154d097966d5d2541243bcfd5c1d90bedab38
1 parent 69b9db2 commit a57465a

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

build.sbt

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,20 @@ lazy val commonSettings = Seq(
9191
unidocSourceFilePatterns := Nil,
9292
)
9393

94+
// Copied from SparkBuild.scala to support Java 17 for unit tests (see apache/spark#34153)
95+
val extraJavaTestArgs = Seq(
96+
"--add-opens=java.base/java.lang=ALL-UNNAMED",
97+
"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
98+
"--add-opens=java.base/java.io=ALL-UNNAMED",
99+
"--add-opens=java.base/java.net=ALL-UNNAMED",
100+
"--add-opens=java.base/java.nio=ALL-UNNAMED",
101+
"--add-opens=java.base/java.util=ALL-UNNAMED",
102+
"--add-opens=java.base/java.util.concurrent=ALL-UNNAMED",
103+
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
104+
"--add-opens=java.base/sun.nio.cs=ALL-UNNAMED",
105+
"--add-opens=java.base/sun.security.action=ALL-UNNAMED",
106+
"--add-opens=java.base/sun.util.calendar=ALL-UNNAMED")
107+
94108
lazy val spark = (project in file("spark"))
95109
.dependsOn(storage)
96110
.enablePlugins(Antlr4Plugin)
@@ -129,20 +143,7 @@ lazy val spark = (project in file("spark"))
129143

130144
Test / testOptions += Tests.Argument("-oDF"),
131145
Test / testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
132-
133-
// Copied from SparkBuild.scala to support Java 17 (see apache/spark#34153)
134-
(Test / javaOptions) ++= Seq(
135-
"--add-opens=java.base/java.lang=ALL-UNNAMED",
136-
"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
137-
"--add-opens=java.base/java.io=ALL-UNNAMED",
138-
"--add-opens=java.base/java.net=ALL-UNNAMED",
139-
"--add-opens=java.base/java.nio=ALL-UNNAMED",
140-
"--add-opens=java.base/java.util=ALL-UNNAMED",
141-
"--add-opens=java.base/java.util.concurrent=ALL-UNNAMED",
142-
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
143-
"--add-opens=java.base/sun.nio.cs=ALL-UNNAMED",
144-
"--add-opens=java.base/sun.security.action=ALL-UNNAMED",
145-
"--add-opens=java.base/sun.util.calendar=ALL-UNNAMED"),
146+
Test / javaOptions ++= extraJavaTestArgs, // Required for UTs with Java 17
146147

147148
// Don't execute in parallel since we can't have multiple Sparks in the same JVM
148149
Test / parallelExecution := false,
@@ -253,7 +254,8 @@ lazy val sharing = (project in file("sharing"))
253254
"org.apache.spark" %% "spark-core" % sparkVersion % "test" classifier "tests",
254255
"org.apache.spark" %% "spark-sql" % sparkVersion % "test" classifier "tests",
255256
"org.apache.spark" %% "spark-hive" % sparkVersion % "test" classifier "tests",
256-
)
257+
),
258+
Test / javaOptions ++= extraJavaTestArgs // Required for UTs with Java 17
257259
).configureUnidoc()
258260

259261
lazy val kernelApi = (project in file("kernel/kernel-api"))

0 commit comments

Comments
 (0)