--- old/./build.gradle	2018-05-25 10:04:40.595218419 -0700
+++ new/./build.gradle	2018-05-25 10:04:40.363218422 -0700
@@ -1729,11 +1729,6 @@
     }
 }
 
-// Qualified exports needed by javafx.* modules (excluding javafx.swing)
-def qualExportsCore = [
-    "--add-exports=java.desktop/sun.print=javafx.graphics",
-]
-
 // Qualified exports needed by javafx.swing
 def qualExportsSwing = [
         "--add-exports=java.desktop/java.awt.dnd.peer=javafx.swing",
@@ -1819,8 +1814,6 @@
     sourceSets.main.java.srcDirs += "$buildDir/gensrc/java"
 
     compileJava.dependsOn processVersionInfo
-
-    compileJava.options.compilerArgs.addAll(qualExportsCore)
 }
 
 // The graphics module is needed for any graphical JavaFX application. It requires
@@ -1935,7 +1928,6 @@
             '-implicit:none',
             '--module-source-path', defaultModuleSourcePath
             ] )
-        options.compilerArgs.addAll(qualExportsCore)
     }
     classes.dependsOn(compileFullJava)
 
@@ -2245,8 +2237,6 @@
             }
         }
     }
-
-    compileJava.options.compilerArgs.addAll(qualExportsCore)
 }
 
 project(":controls") {
@@ -2305,8 +2295,6 @@
         into project.moduleShimsDir
         include "**/*.bss"
     })
-
-    compileJava.options.compilerArgs.addAll(qualExportsCore)
 }
 
 project(":swing") {
@@ -2342,7 +2330,6 @@
         }
     }
 
-    compileJava.options.compilerArgs.addAll(qualExportsCore)
     compileJava.options.compilerArgs.addAll(qualExportsSwing)
 }
 
@@ -2436,8 +2423,6 @@
         // FIXME: change this to also allow JDK 9 boot jdk
         classpath += files("$JDK_HOME/jre/lib/ext/nashorn.jar")
     }
-
-    compileJava.options.compilerArgs.addAll(qualExportsCore)
 }
 
 project(":fxpackagerservices") {
@@ -3638,8 +3623,6 @@
             dependsOn buildNativeTargets
         }
     }
-
-    compileJava.options.compilerArgs.addAll(qualExportsCore)
 }
 
 project(":web") {
@@ -3863,8 +3846,6 @@
     if (IS_COMPILE_WEBKIT) {
         assemble.dependsOn compileJavaDOMBinding, drtJar
     }
-
-    compileJava.options.compilerArgs.addAll(qualExportsCore)
 }
 
 // This project is for system tests that need to run with a full SDK.
--- old/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java	2018-05-25 10:04:41.287218407 -0700
+++ new/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java	2018-05-25 10:04:41.075218411 -0700
@@ -106,7 +106,8 @@
             PrintRequestAttribute alwaysOnTop = null;
             try {
                 if (onTopClass == null) {
-                    onTopClass = Class.forName("sun.print.DialogOnTop");
+                    onTopClass =
+                    Class.forName("javax.print.attribute.standard.DialogOwner");
                 }
                 Constructor<PrintRequestAttribute> cons =
                      onTopClass.getConstructor(long.class);
--- old/dependencies/java.desktop/module-info.java.extra	2018-05-25 10:04:41.791218399 -0700
+++ /dev/null	2018-03-07 09:39:34.227636345 -0800
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, 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
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-exports java.awt.dnd.peer to javafx.swing;
-exports sun.awt to javafx.swing;
-exports sun.awt.dnd to javafx.swing;
-exports sun.awt.image to javafx.swing;
-exports sun.java2d to javafx.swing;
-exports sun.swing to javafx.swing;
-exports sun.print to javafx.graphics;