Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 8923)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 8924)
@@ -1502,5 +1502,5 @@
                 // Ignore all exceptions, including internal error raised by Java 9 Jigsaw EA:
                 // java.lang.InternalError: legacy getBundle can't be used to find sun.awt.resources.awt in module java.desktop
-                // InternalError catch to remove when https://bugs.openjdk.java.net/browse/JI-9025152 is resolved
+                // InternalError catch to remove when https://bugs.openjdk.java.net/browse/JDK-8136804 is resolved
                 if (Main.isTraceEnabled()) {
                     Main.trace(e.getMessage());
@@ -1517,4 +1517,5 @@
         // See Oracle bug database: https://bugs.openjdk.java.net/browse/JDK-7075600
         // and https://bugs.openjdk.java.net/browse/JDK-6923200
+        // The bug seems to have been fixed in Java 8, to remove during transition
         if (getBoolean("jdk.Arrays.useLegacyMergeSort", !Version.getInstance().isLocalBuild())) {
             Utils.updateSystemProperty("java.util.Arrays.useLegacyMergeSort", "true");
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 8923)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 8924)
@@ -936,4 +936,5 @@
      * @see <a href="http://closingbraces.net/2008/11/11/javastringtrim/">Java’s String.trim has a strange idea of whitespace</a>
      * @see <a href="https://bugs.openjdk.java.net/browse/JDK-4080617">JDK bug 4080617</a>
+     * @see <a href="https://bugs.openjdk.java.net/browse/JDK-7190385">JDK bug 7190385</a>
      * @since 5772
      */
Index: trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java	(revision 8923)
+++ trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java	(revision 8924)
@@ -358,5 +358,5 @@
      * @see <a href="https://bugs.launchpad.net/ubuntu/+source/openjdk-7/+bug/1171563">Ubuntu-1171563</a>
      * @see <a href="http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1669">IcedTea-1669</a>
-     * @see <a href="https://bugs.openjdk.java.net/browse/JI-9010334">JI-9010334</a>
+     * @see <a href="https://bugs.openjdk.java.net/browse/JDK-8034224">JDK-8034224</a>
      */
     protected static boolean isBugInMaximumWindowBounds(Rectangle maxbounds) {