src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 32,41 ****
--- 32,43 ----
  import java.lang.module.ModuleDescriptor.Version;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.regex.Pattern;
  import java.util.regex.PatternSyntaxException;
+ 
+ import jdk.internal.module.ModulePath;
  import jdk.internal.module.ModuleResolution;
  
  /**
   * Parser for GNU Style Options.
   */
*** 153,164 ****
                      Path[] paths = new Path[dirs.length];
                      int i = 0;
                      for (String dir : dirs) {
                          paths[i++] = Paths.get(dir);
                      }
!                     jartool.moduleFinder = ModuleFinder.compose(jartool.moduleFinder,
!                                                                 ModuleFinder.of(paths));
                  }
              },
              new Option(false, OptionType.CREATE_UPDATE, "--do-not-resolve-by-default") {
                  void process(Main jartool, String opt, String arg) {
                      ModuleResolution mres = jartool.moduleResolution;
--- 155,166 ----
                      Path[] paths = new Path[dirs.length];
                      int i = 0;
                      for (String dir : dirs) {
                          paths[i++] = Paths.get(dir);
                      }
!                     jartool.moduleFinder =
!                         new ModulePath(Runtime.version(), true, paths);
                  }
              },
              new Option(false, OptionType.CREATE_UPDATE, "--do-not-resolve-by-default") {
                  void process(Main jartool, String opt, String arg) {
                      ModuleResolution mres = jartool.moduleResolution;