--- a/langtools/test/tools/all/RunCodingRules.java Wed Aug 10 13:52:02 2016 -0700
+++ b/langtools/test/tools/all/RunCodingRules.java Wed Aug 10 15:47:46 2016 -0700
@@ -111,11 +111,11 @@
Path crulesTarget = targetDir.resolve("crules");
Files.createDirectories(crulesTarget);
List<String> crulesOptions = Arrays.asList(
- "-XaddExports:jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
- "-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+ "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"-d", crulesTarget.toString());
javaCompiler.getTask(null, fm, noErrors, crulesOptions, null,
fm.getJavaFileObjectsFromFiles(crulesFiles)).call();
@@ -178,7 +178,7 @@
List<String> options = Arrays.asList(
"-d", sourceTarget.toString(),
- "-modulesourcepath", mainSrcDir + FS + "*" + FS + "share" + FS + "classes" + PS
+ "--module-source-path", mainSrcDir + FS + "*" + FS + "share" + FS + "classes" + PS
+ genSrcTarget + FS + "*" + FS + "share" + FS + "classes",
"-XDaccessInternalAPI",
"-processorpath", processorPath,