changeset 45654:5ff2edfa03fc

8182416: Clean up module-info.java like move requires transitive adjacent to exports Reviewed-by: alanb
author mchung
date Sat, 17 Jun 2017 11:50:55 -0700
parents 532c2d82aed0
children 02c95aa8a53a
files jdk/src/java.base/share/classes/module-info.java jdk/src/java.datatransfer/share/classes/module-info.java jdk/src/java.desktop/share/classes/module-info.java jdk/src/java.logging/share/classes/module-info.java jdk/src/java.management.rmi/share/classes/module-info.java jdk/src/java.management/share/classes/module-info.java jdk/src/java.naming/share/classes/module-info.java jdk/src/java.prefs/share/classes/module-info.java jdk/src/java.rmi/share/classes/module-info.java jdk/src/java.scripting/share/classes/module-info.java jdk/src/java.se.ee/share/classes/module-info.java jdk/src/java.security.jgss/share/classes/module-info.java jdk/src/java.security.sasl/share/classes/module-info.java jdk/src/java.smartcardio/share/classes/module-info.java jdk/src/java.sql.rowset/share/classes/module-info.java jdk/src/java.sql/share/classes/module-info.java jdk/src/java.transaction/share/classes/module-info.java jdk/src/java.xml.crypto/share/classes/module-info.java jdk/src/jdk.accessibility/share/classes/module-info.java jdk/src/jdk.attach/share/classes/module-info.java jdk/src/jdk.charsets/share/classes/module-info.java jdk/src/jdk.crypto.cryptoki/share/classes/module-info.java jdk/src/jdk.editpad/share/classes/module-info.java jdk/src/jdk.httpserver/share/classes/module-info.java jdk/src/jdk.incubator.httpclient/share/classes/module-info.java jdk/src/jdk.internal.ed/share/classes/module-info.java jdk/src/jdk.internal.jvmstat/share/classes/module-info.java jdk/src/jdk.jartool/share/classes/module-info.java jdk/src/jdk.jconsole/share/classes/module-info.java jdk/src/jdk.jsobject/share/classes/module-info.java jdk/src/jdk.jstatd/share/classes/module-info.java jdk/src/jdk.naming.dns/share/classes/module-info.java jdk/src/jdk.naming.rmi/share/classes/module-info.java jdk/src/jdk.policytool/share/classes/module-info.java jdk/src/jdk.security.auth/share/classes/module-info.java jdk/src/jdk.security.jgss/share/classes/module-info.java jdk/src/jdk.unsupported/share/classes/module-info.java jdk/src/jdk.zipfs/share/classes/module-info.java
diffstat 38 files changed, 151 insertions(+), 90 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/java.base/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.base/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -129,37 +129,6 @@
     exports javax.security.cert;
 
 
-    // the service types defined by the APIs in this module
-
-    uses java.lang.System.LoggerFinder;
-    uses java.net.ContentHandlerFactory;
-    uses java.net.spi.URLStreamHandlerProvider;
-    uses java.nio.channels.spi.AsynchronousChannelProvider;
-    uses java.nio.channels.spi.SelectorProvider;
-    uses java.nio.charset.spi.CharsetProvider;
-    uses java.nio.file.spi.FileSystemProvider;
-    uses java.nio.file.spi.FileTypeDetector;
-    uses java.security.Provider;
-    uses java.text.spi.BreakIteratorProvider;
-    uses java.text.spi.CollatorProvider;
-    uses java.text.spi.DateFormatProvider;
-    uses java.text.spi.DateFormatSymbolsProvider;
-    uses java.text.spi.DecimalFormatSymbolsProvider;
-    uses java.text.spi.NumberFormatProvider;
-    uses java.time.chrono.AbstractChronology;
-    uses java.time.chrono.Chronology;
-    uses java.time.zone.ZoneRulesProvider;
-    uses java.util.spi.CalendarDataProvider;
-    uses java.util.spi.CalendarNameProvider;
-    uses java.util.spi.CurrencyNameProvider;
-    uses java.util.spi.LocaleNameProvider;
-    uses java.util.spi.ResourceBundleControlProvider;
-    uses java.util.spi.ResourceBundleProvider;
-    uses java.util.spi.TimeZoneNameProvider;
-    uses java.util.spi.ToolProvider;
-    uses javax.security.auth.spi.LoginModule;
-
-
     // additional qualified exports may be inserted at build time
     // see make/gensrc/GenModuleInfo.gmk
 
@@ -192,11 +161,6 @@
         jdk.scripting.nashorn;
     exports jdk.internal.math to
         java.desktop;
-    exports jdk.internal.module to
-        java.instrument,
-        java.management.rmi,
-        jdk.jartool,
-        jdk.jlink;
     exports jdk.internal.misc to
         java.desktop,
         java.logging,
@@ -218,6 +182,11 @@
         jdk.scripting.nashorn.shell,
         jdk.unsupported,
         jdk.internal.vm.ci;
+    exports jdk.internal.module to
+        java.instrument,
+        java.management.rmi,
+        jdk.jartool,
+        jdk.jlink;
     exports jdk.internal.perf to
         java.desktop,
         java.management,
@@ -233,6 +202,9 @@
         jdk.dynalink,
         jdk.scripting.nashorn,
         jdk.unsupported;
+    exports jdk.internal.vm to
+        jdk.management.agent,
+        jdk.internal.jvmstat;
     exports jdk.internal.vm.annotation to
         jdk.unsupported,
         jdk.internal.vm.ci,
@@ -241,9 +213,6 @@
         jdk.jartool,
         jdk.jdeps,
         jdk.jlink;
-    exports jdk.internal.vm to
-        jdk.management.agent,
-        jdk.internal.jvmstat;
     exports sun.net to
         jdk.incubator.httpclient;
     exports sun.net.ext to
@@ -349,7 +318,39 @@
     exports sun.util.resources to
         jdk.localedata;
 
+
+    // the service types defined by the APIs in this module
+
+    uses java.lang.System.LoggerFinder;
+    uses java.net.ContentHandlerFactory;
+    uses java.net.spi.URLStreamHandlerProvider;
+    uses java.nio.channels.spi.AsynchronousChannelProvider;
+    uses java.nio.channels.spi.SelectorProvider;
+    uses java.nio.charset.spi.CharsetProvider;
+    uses java.nio.file.spi.FileSystemProvider;
+    uses java.nio.file.spi.FileTypeDetector;
+    uses java.security.Provider;
+    uses java.text.spi.BreakIteratorProvider;
+    uses java.text.spi.CollatorProvider;
+    uses java.text.spi.DateFormatProvider;
+    uses java.text.spi.DateFormatSymbolsProvider;
+    uses java.text.spi.DecimalFormatSymbolsProvider;
+    uses java.text.spi.NumberFormatProvider;
+    uses java.time.chrono.AbstractChronology;
+    uses java.time.chrono.Chronology;
+    uses java.time.zone.ZoneRulesProvider;
+    uses java.util.spi.CalendarDataProvider;
+    uses java.util.spi.CalendarNameProvider;
+    uses java.util.spi.CurrencyNameProvider;
+    uses java.util.spi.LocaleNameProvider;
+    uses java.util.spi.ResourceBundleControlProvider;
+    uses java.util.spi.ResourceBundleProvider;
+    uses java.util.spi.TimeZoneNameProvider;
+    uses java.util.spi.ToolProvider;
+    uses javax.security.auth.spi.LoginModule;
+
     // JDK-internal service types
+
     uses jdk.internal.logger.DefaultLoggerFinder;
     uses sun.security.ssl.ClientKeyExchangeService;
     uses sun.text.spi.JavaTimeDateTimePatternProvider;
@@ -358,7 +359,6 @@
     uses sun.util.resources.LocaleData.CommonResourceBundleProvider;
     uses sun.util.resources.LocaleData.SupplementaryResourceBundleProvider;
 
-
     // Built-in service providers that are located via ServiceLoader
 
     provides java.nio.file.spi.FileSystemProvider with
--- a/jdk/src/java.datatransfer/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.datatransfer/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -31,6 +31,8 @@
  */
 module java.datatransfer {
     exports java.awt.datatransfer;
+
     exports sun.datatransfer to java.desktop;
+
     uses sun.datatransfer.DesktopDatatransferService;
 }
--- a/jdk/src/java.desktop/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.desktop/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -49,9 +49,10 @@
  * @since 9
  */
 module java.desktop {
+    requires java.prefs;
+
     requires transitive java.datatransfer;
     requires transitive java.xml;
-    requires java.prefs;
 
     exports java.applet;
     exports java.awt;
--- a/jdk/src/java.logging/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.logging/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -31,6 +31,7 @@
  */
 module java.logging {
     exports java.util.logging;
+
     provides jdk.internal.logger.DefaultLoggerFinder with
         sun.util.logging.internal.LoggingProviderImpl;
 }
--- a/jdk/src/java.management.rmi/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.management.rmi/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -51,9 +51,10 @@
  */
 module java.management.rmi {
 
+    requires java.naming;
+
     requires transitive java.management;
     requires transitive java.rmi;
-    requires java.naming;
 
     exports javax.management.remote.rmi;
 
@@ -68,9 +69,9 @@
     // The java.management.rmi module provides implementations
     // of the JMXConnectorProvider and JMXConnectorServerProvider
     // services supporting the RMI protocol.
-    provides javax.management.remote.JMXConnectorProvider
-        with com.sun.jmx.remote.protocol.rmi.ClientProvider;
-    provides javax.management.remote.JMXConnectorServerProvider
-        with com.sun.jmx.remote.protocol.rmi.ServerProvider;
+    provides javax.management.remote.JMXConnectorProvider with
+        com.sun.jmx.remote.protocol.rmi.ClientProvider;
+    provides javax.management.remote.JMXConnectorServerProvider with
+        com.sun.jmx.remote.protocol.rmi.ServerProvider;
 
 }
--- a/jdk/src/java.management/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.management/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -46,25 +46,30 @@
     exports javax.management.relation;
     exports javax.management.remote;
     exports javax.management.timer;
+
     exports com.sun.jmx.remote.internal to
-            java.management.rmi,
-            jdk.management.agent;
+        java.management.rmi,
+        jdk.management.agent;
     exports com.sun.jmx.remote.security to
-            java.management.rmi,
-            jdk.management.agent;
-    exports com.sun.jmx.remote.util to java.management.rmi;
+        java.management.rmi,
+        jdk.management.agent;
+    exports com.sun.jmx.remote.util to
+        java.management.rmi;
     exports sun.management to
         jdk.jconsole,
         jdk.management,
         jdk.management.agent;
-    exports sun.management.counter to jdk.management.agent;
-    exports sun.management.counter.perf to jdk.management.agent;
-    exports sun.management.spi to jdk.management;
+    exports sun.management.counter to
+        jdk.management.agent;
+    exports sun.management.counter.perf to
+        jdk.management.agent;
+    exports sun.management.spi to
+        jdk.management;
 
     uses javax.management.remote.JMXConnectorProvider;
     uses javax.management.remote.JMXConnectorServerProvider;
     uses sun.management.spi.PlatformMBeanProvider;
 
-    provides javax.security.auth.spi.LoginModule
-        with com.sun.jmx.remote.security.FileLoginModule;
+    provides javax.security.auth.spi.LoginModule with
+        com.sun.jmx.remote.security.FileLoginModule;
 }
--- a/jdk/src/java.naming/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.naming/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -37,13 +37,17 @@
     exports javax.naming.event;
     exports javax.naming.ldap;
     exports javax.naming.spi;
+
     exports com.sun.jndi.toolkit.ctx to
         jdk.naming.dns;
     exports com.sun.jndi.toolkit.url to
         jdk.naming.dns,
         jdk.naming.rmi;
+
     uses javax.naming.ldap.StartTlsResponse;
     uses javax.naming.spi.InitialContextFactory;
-    provides java.security.Provider with sun.security.provider.certpath.ldap.JdkLDAP;
+
+    provides java.security.Provider with
+        sun.security.provider.certpath.ldap.JdkLDAP;
 }
 
--- a/jdk/src/java.prefs/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.prefs/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -35,5 +35,6 @@
     requires java.xml;
 
     exports java.util.prefs;
+
     uses java.util.prefs.PreferencesFactory;
 }
--- a/jdk/src/java.rmi/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.rmi/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -53,6 +53,7 @@
     exports java.rmi.registry;
     exports java.rmi.server;
     exports javax.rmi.ssl;
+
     // com.sun.rmi.rmid contains permissions classes that must be
     // accessible to the security manager at initialization time
     exports com.sun.rmi.rmid to java.base;
@@ -66,5 +67,6 @@
         java.management.rmi,
         jdk.management.agent,
         jdk.jconsole;
+
     uses java.rmi.server.RMIClassLoaderSpi;
 }
--- a/jdk/src/java.scripting/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.scripting/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -44,5 +44,6 @@
  */
 module java.scripting {
     exports javax.script;
+
     uses javax.script.ScriptEngineFactory;
 }
--- a/jdk/src/java.se.ee/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.se.ee/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -32,8 +32,8 @@
  * @moduleGraph
  * @since 9
  */
-@SuppressWarnings({"deprecation",
-                   "removal"}) // java.corba and other modules
+// suppress warning for java.corba and other modules
+@SuppressWarnings({"deprecation", "removal"})
 @Deprecated(since="9", forRemoval=true)
 module java.se.ee {
 
--- a/jdk/src/java.security.jgss/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.security.jgss/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -33,8 +33,10 @@
  */
 module java.security.jgss {
     requires java.naming;
+
     exports javax.security.auth.kerberos;
     exports org.ietf.jgss;
+
     exports sun.security.jgss to
         jdk.security.jgss;
     exports sun.security.jgss.krb5 to
@@ -51,8 +53,9 @@
     opens sun.net.www.protocol.http.spnego to
         java.base;
 
-    provides java.security.Provider with sun.security.jgss.SunProvider;
-    provides sun.security.ssl.ClientKeyExchangeService
-        with sun.security.krb5.internal.ssl.Krb5KeyExchangeService;
+    provides java.security.Provider with
+        sun.security.jgss.SunProvider;
+    provides sun.security.ssl.ClientKeyExchangeService with
+        sun.security.krb5.internal.ssl.Krb5KeyExchangeService;
 }
 
--- a/jdk/src/java.security.sasl/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.security.sasl/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -37,8 +37,11 @@
     requires java.logging;
 
     exports javax.security.sasl;
+
     exports com.sun.security.sasl.util to
         jdk.security.jgss;
-    provides java.security.Provider with com.sun.security.sasl.Provider;
+
+    provides java.security.Provider with
+        com.sun.security.sasl.Provider;
 }
 
--- a/jdk/src/java.smartcardio/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.smartcardio/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -31,6 +31,8 @@
  */
 module java.smartcardio {
     exports javax.smartcardio;
-    provides java.security.Provider with sun.security.smartcardio.SunPCSC;
+
+    provides java.security.Provider with
+        sun.security.smartcardio.SunPCSC;
 }
 
--- a/jdk/src/java.sql.rowset/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.sql.rowset/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -39,5 +39,6 @@
     exports javax.sql.rowset;
     exports javax.sql.rowset.serial;
     exports javax.sql.rowset.spi;
+
     uses javax.sql.rowset.RowSetFactory;
 }
--- a/jdk/src/java.sql/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.sql/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -38,5 +38,6 @@
     exports java.sql;
     exports javax.sql;
     exports javax.transaction.xa;
+
     uses java.sql.Driver;
 }
--- a/jdk/src/java.transaction/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.transaction/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -35,6 +35,7 @@
 @Deprecated(since="9", forRemoval=true)
 module java.transaction {
     requires transitive java.rmi;
+
     exports javax.transaction;
 }
 
--- a/jdk/src/java.xml.crypto/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/java.xml.crypto/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -30,8 +30,9 @@
  * @since 9
  */
 module java.xml.crypto {
+    requires java.logging;
+
     requires transitive java.xml;
-    requires java.logging;
 
     exports javax.xml.crypto;
     exports javax.xml.crypto.dom;
@@ -39,6 +40,8 @@
     exports javax.xml.crypto.dsig.dom;
     exports javax.xml.crypto.dsig.keyinfo;
     exports javax.xml.crypto.dsig.spec;
-    provides java.security.Provider with org.jcp.xml.dsig.internal.dom.XMLDSigRI;
+
+    provides java.security.Provider with
+        org.jcp.xml.dsig.internal.dom.XMLDSigRI;
 }
 
--- a/jdk/src/jdk.accessibility/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.accessibility/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -31,6 +31,7 @@
  */
 module jdk.accessibility {
     requires transitive java.desktop;
+
     exports com.sun.java.accessibility.util;
 }
 
--- a/jdk/src/jdk.attach/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.attach/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -36,8 +36,12 @@
 
     exports com.sun.tools.attach;
     exports com.sun.tools.attach.spi;
+
     exports sun.tools.attach to
         jdk.jcmd;
+
     uses com.sun.tools.attach.spi.AttachProvider;
-    provides com.sun.tools.attach.spi.AttachProvider with sun.tools.attach.AttachProviderImpl;
+
+    provides com.sun.tools.attach.spi.AttachProvider with
+        sun.tools.attach.AttachProviderImpl;
 }
--- a/jdk/src/jdk.charsets/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.charsets/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -33,6 +33,6 @@
  * @since 9
  */
 module jdk.charsets {
-    provides java.nio.charset.spi.CharsetProvider
-        with sun.nio.cs.ext.ExtendedCharsets;
+    provides java.nio.charset.spi.CharsetProvider with
+        sun.nio.cs.ext.ExtendedCharsets;
 }
--- a/jdk/src/jdk.crypto.cryptoki/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.crypto.cryptoki/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -34,5 +34,6 @@
 module jdk.crypto.cryptoki {
     // Depends on SunEC provider for EC related functionality
     requires jdk.crypto.ec;
+
     provides java.security.Provider with sun.security.pkcs11.SunPKCS11;
 }
--- a/jdk/src/jdk.editpad/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.editpad/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -30,8 +30,9 @@
  * @since 9
  */
 module jdk.editpad {
+    requires java.desktop;
     requires jdk.internal.ed;
-    requires java.desktop;
-    provides jdk.internal.editor.spi.BuildInEditorProvider
-              with jdk.editpad.EditPadProvider;
+
+    provides jdk.internal.editor.spi.BuildInEditorProvider with
+        jdk.editpad.EditPadProvider;
 }
--- a/jdk/src/jdk.httpserver/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.httpserver/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -35,5 +35,6 @@
 
     exports com.sun.net.httpserver;
     exports com.sun.net.httpserver.spi;
+
     uses com.sun.net.httpserver.spi.HttpServerProvider;
 }
--- a/jdk/src/jdk.incubator.httpclient/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.incubator.httpclient/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -31,7 +31,6 @@
  * @since 9
  */
 module jdk.incubator.httpclient {
-    requires java.base;
     exports jdk.incubator.http;
 }
 
--- a/jdk/src/jdk.internal.ed/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.internal.ed/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -31,6 +31,11 @@
  */
 module jdk.internal.ed {
 
-    exports jdk.internal.editor.spi to jdk.editpad, jdk.jshell, jdk.scripting.nashorn.shell;
-    exports jdk.internal.editor.external to jdk.jshell, jdk.scripting.nashorn.shell;
+    exports jdk.internal.editor.spi to
+        jdk.editpad,
+        jdk.jshell,
+        jdk.scripting.nashorn.shell;
+    exports jdk.internal.editor.external to
+        jdk.jshell,
+        jdk.scripting.nashorn.shell;
 }
--- a/jdk/src/jdk.internal.jvmstat/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.internal.jvmstat/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -42,6 +42,7 @@
         jdk.jstatd;
 
     uses sun.jvmstat.monitor.MonitoredHostService;
+
     provides sun.jvmstat.monitor.MonitoredHostService with
         sun.jvmstat.perfdata.monitor.protocol.file.MonitoredHostFileService,
         sun.jvmstat.perfdata.monitor.protocol.local.MonitoredHostLocalService;
--- a/jdk/src/jdk.jartool/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.jartool/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -48,5 +48,6 @@
     exports com.sun.jarsigner;
     exports jdk.security.jarsigner;
 
-    provides java.util.spi.ToolProvider with sun.tools.jar.JarToolProvider;
+    provides java.util.spi.ToolProvider with
+        sun.tools.jar.JarToolProvider;
 }
--- a/jdk/src/jdk.jconsole/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.jconsole/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -39,14 +39,17 @@
  * @since 9
  */
 module jdk.jconsole {
-    requires transitive java.desktop;
-    requires transitive java.management;
     requires java.management.rmi;
     requires java.rmi;
     requires jdk.attach;
     requires jdk.internal.jvmstat;
     requires jdk.management;
     requires jdk.management.agent;
+
+    requires transitive java.desktop;
+    requires transitive java.management;
+
     exports com.sun.tools.jconsole;
+
     uses com.sun.tools.jconsole.JConsolePlugin;
 }
--- a/jdk/src/jdk.jsobject/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.jsobject/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -31,6 +31,7 @@
  */
 module jdk.jsobject {
     requires java.desktop;
+
     exports netscape.javascript;
 
     uses jdk.internal.netscape.javascript.spi.JSObjectProvider;
--- a/jdk/src/jdk.jstatd/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.jstatd/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -42,5 +42,6 @@
     // RMI needs to serialize types in this package
     exports sun.jvmstat.monitor.remote to java.rmi;
 
-    provides sun.jvmstat.monitor.MonitoredHostService with sun.jvmstat.perfdata.monitor.protocol.rmi.MonitoredHostRmiService;
+    provides sun.jvmstat.monitor.MonitoredHostService with
+        sun.jvmstat.perfdata.monitor.protocol.rmi.MonitoredHostRmiService;
 }
--- a/jdk/src/jdk.naming.dns/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.naming.dns/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -36,6 +36,6 @@
     // temporary export until NamingManager.getURLContext uses services
     exports com.sun.jndi.url.dns to java.naming;
 
-    provides javax.naming.spi.InitialContextFactory
-        with com.sun.jndi.dns.DnsContextFactory;
+    provides javax.naming.spi.InitialContextFactory with
+        com.sun.jndi.dns.DnsContextFactory;
 }
--- a/jdk/src/jdk.naming.rmi/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.naming.rmi/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -33,10 +33,12 @@
 module jdk.naming.rmi {
     requires java.naming;
     requires java.rmi;
-    provides javax.naming.spi.InitialContextFactory
-        with com.sun.jndi.rmi.registry.RegistryContextFactory;
 
     // temporary export until NamingManager.getURLContext uses services
     exports com.sun.jndi.url.rmi to java.naming;
     exports com.sun.jndi.rmi.registry to java.rmi;
+
+    provides javax.naming.spi.InitialContextFactory with
+        com.sun.jndi.rmi.registry.RegistryContextFactory;
+
 }
--- a/jdk/src/jdk.policytool/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.policytool/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -40,8 +40,8 @@
     requires java.desktop;
     requires java.logging;
     requires java.management;
+    requires java.security.jgss;
     requires java.sql;
     requires jdk.net;
-    requires java.security.jgss;
     requires jdk.security.jgss;
 }
--- a/jdk/src/jdk.security.auth/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.security.auth/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -32,8 +32,10 @@
  * @since 9
  */
 module jdk.security.auth {
+
+    requires java.security.jgss;
+
     requires transitive java.naming;
-    requires java.security.jgss;
 
     exports com.sun.security.auth;
     exports com.sun.security.auth.callback;
--- a/jdk/src/jdk.security.jgss/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.security.jgss/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -31,10 +31,14 @@
  * @since 9
  */
 module jdk.security.jgss {
-    requires transitive java.security.jgss;
     requires java.logging;
     requires java.security.sasl;
+
+    requires transitive java.security.jgss;
+
     exports com.sun.security.jgss;
-    provides java.security.Provider with com.sun.security.sasl.gsskerb.JdkSASL;
+
+    provides java.security.Provider with
+        com.sun.security.sasl.gsskerb.JdkSASL;
 }
 
--- a/jdk/src/jdk.unsupported/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.unsupported/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -24,9 +24,9 @@
  */
 
 module jdk.unsupported {
+    exports com.sun.nio.file;
     exports sun.misc;
     exports sun.reflect;
-    exports com.sun.nio.file;
 
     opens sun.misc;
     opens sun.reflect;
--- a/jdk/src/jdk.zipfs/share/classes/module-info.java	Sat Jun 17 08:03:05 2017 +0100
+++ b/jdk/src/jdk.zipfs/share/classes/module-info.java	Sat Jun 17 11:50:55 2017 -0700
@@ -29,12 +29,14 @@
  * <p> The zip file system provider treats a zip or JAR file as a file system
  * and provides the ability to manipulate the contents of the file.
  * The zip file system provider can be created by
- * {@link java.nio.file.FileSystems#newFileSystem} if installed.
+ * {@link java.nio.file.FileSystems#newFileSystem
+ * FileSystems.newFileSystem} if installed.
  *
  * @provides java.nio.file.spi.FileSystemProvider
  * @moduleGraph
  * @since 9
  */
 module jdk.zipfs {
-    provides java.nio.file.spi.FileSystemProvider with jdk.nio.zipfs.ZipFileSystemProvider;
+    provides java.nio.file.spi.FileSystemProvider with
+        jdk.nio.zipfs.ZipFileSystemProvider;
 }