Skip to content

Commit fe5d037

Browse files
committed
Treat ALL-DEFAULT runtime modules as root modules.
JUnit Jupiter Engine now "requires java.scripting" which is not resolved by default -- at least on OpenJDK 10. Details at http://mail.openjdk.java.net/pipermail/jigsaw-dev/2018-February/thread.html#13574 Related issue #1282
1 parent b11aa0d commit fe5d037

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

junit-platform-commons-java-9/junit-platform-commons-java-9.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ task execScanModulepath(type: Exec, dependsOn: [generateDependenciesDirectory, g
5454
generateDependenciesDirectory.destinationDir,
5555
generateIntegrationTestsJar.archivePath
5656
).asPath,
57-
'--add-modules', 'ALL-MODULE-PATH',
57+
'--add-modules', 'ALL-MODULE-PATH,ALL-DEFAULT',
5858
'--module', 'org.junit.platform.console',
5959
'--scan-modules'
6060
]

junit-platform-gradle-plugin/src/main/groovy/org/junit/platform/gradle/plugin/JUnitPlatformPlugin.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,10 @@ class JUnitPlatformPlugin implements Plugin<Project> {
134134
jvmArgs += ['--module-path', junitExtension.modulepath.asPath]
135135
}
136136
// Treat all modules on the path as root modules.
137+
// Also add all default modules, needed on OpenJDK to resolve "java.scripting".
138+
// See http://mail.openjdk.java.net/pipermail/jigsaw-dev/2018-February/thread.html#13574
137139
if (!jvmArgs.contains('--add-modules')) {
138-
jvmArgs += ['--add-modules', 'ALL-MODULE-PATH']
140+
jvmArgs += ['--add-modules', 'ALL-MODULE-PATH,ALL-DEFAULT']
139141
}
140142
// Set main class name to '--module' (https://github.com/junit-team/junit5/issues/1234)
141143
// The first argument will be 'org.junit.platform.console'

junit-platform-gradle-plugin/src/test/groovy/org/junit/platform/gradle/plugin/JUnitPlatformPluginSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ class JUnitPlatformPluginSpec extends Specification {
224224
junitTask instanceof JavaExec
225225

226226
junitTask.jvmArgs.containsAll('--module-path', project.files("abc.jar").asPath)
227-
junitTask.jvmArgs.containsAll('--add-modules', 'ALL-MODULE-PATH')
227+
junitTask.jvmArgs.containsAll('--add-modules', 'ALL-MODULE-PATH,ALL-DEFAULT')
228228
junitTask.main == '--module'
229229
junitTask.args[0] == 'org.junit.platform.console'
230230
junitTask.args.contains('--scan-modules')

0 commit comments

Comments
 (0)