src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java

@@ -384,17 +384,10 @@
             void process(JdepsTask task, String opt, String arg) throws BadArgs {
                 task.options.includePattern = Pattern.compile(arg);
             }
         },
 
-        // Another alternative to list modules in --add-modules option
-        new HiddenOption(true, "--include-system-modules") {
-            void process(JdepsTask task, String opt, String arg) throws BadArgs {
-                task.options.includeSystemModulePattern = Pattern.compile(arg);
-            }
-        },
-
         new Option(false, "-P", "-profile") {
             void process(JdepsTask task, String opt, String arg) throws BadArgs {
                 task.options.showProfile = true;
             }
         },

@@ -1019,12 +1012,12 @@
         // Filter specified by -filter, -package, -regex, and --require options
         JdepsFilter.Builder builder = new JdepsFilter.Builder();
 
         // source filters
         builder.includePattern(options.includePattern);
-        builder.includeSystemModules(options.includeSystemModulePattern);
 
+        // target filters
         builder.filter(options.filterSamePackage, options.filterSameArchive);
         builder.findJDKInternals(options.findJDKInternals);
 
         // --require
         if (!options.requires.isEmpty()) {

@@ -1042,15 +1035,10 @@
             builder.packages(options.packageNames);
         // -filter
         if (options.filterRegex != null)
             builder.filter(options.filterRegex);
 
-        // check if system module is set
-        config.rootModules().stream()
-              .map(Module::name)
-              .forEach(builder::includeIfSystemModule);
-
         return builder.build();
     }
 
     public void handleOptions(String[] args) throws BadArgs {
         // process options

@@ -1160,23 +1148,21 @@
         int depth = 1;
         Set<String> requires = new HashSet<>();
         Set<String> packageNames = new HashSet<>();
         Pattern regex;             // apply to the dependences
         Pattern includePattern;
-        Pattern includeSystemModulePattern;
         boolean inverse = false;
         boolean compileTimeView = false;
         String systemModulePath = System.getProperty("java.home");
         String upgradeModulePath;
         String modulePath;
         String rootModule;
         Set<String> addmods = new HashSet<>();
         Runtime.Version multiRelease;
 
         boolean hasSourcePath() {
-            return !addmods.isEmpty() || includePattern != null ||
-                        includeSystemModulePattern != null;
+            return !addmods.isEmpty() || includePattern != null;
         }
 
         boolean hasFilter() {
             return numFilters() > 0;
         }