--- old/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java 2016-12-19 10:01:49.000000000 -0800 +++ new/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java 2016-12-19 10:01:48.000000000 -0800 @@ -70,6 +70,7 @@ // the token for "all modules on the module path" public static final String ALL_MODULE_PATH = "ALL-MODULE-PATH"; public static final String ALL_DEFAULT = "ALL-DEFAULT"; + public static final String ALL_SYSTEM = "ALL-SYSTEM"; public static final String MODULE_INFO = "module-info.class"; private final SystemModuleFinder system; @@ -199,12 +200,10 @@ return m!= null ? Optional.of(m.descriptor()) : Optional.empty(); } - boolean isSystem(Module m) { - return system.find(m.name()).isPresent(); - } - boolean isValidToken(String name) { - return ALL_MODULE_PATH.equals(name) || ALL_DEFAULT.equals(name); + return ALL_MODULE_PATH.equals(name) || + ALL_DEFAULT.equals(name) || + ALL_SYSTEM.equals(name); } /** @@ -534,6 +533,9 @@ case ALL_DEFAULT: this.addAllDefaultModules = true; break; + case ALL_SYSTEM: + this.addAllSystemModules = true; + break; default: this.rootModules.add(mn); }