Index: trunk/src/com/kitfox/svg/SVGUniverse.java
===================================================================
--- trunk/src/com/kitfox/svg/SVGUniverse.java	(revision 6616)
+++ trunk/src/com/kitfox/svg/SVGUniverse.java	(revision 6617)
@@ -389,5 +389,5 @@
             {
                 //Workaround for resources stored in jars loaded by Webstart.
-                //http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6753651
+                //https://bugs.openjdk.java.net/browse/JDK-6753651
                 url = SVGUniverse.class.getResource("xmlBase.getPath()");
             }
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6616)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6617)
@@ -1261,5 +1261,5 @@
         // Workaround to fix a Java bug.
         // Force AWT toolkit to update its internal preferences (fix #3645).
-        // This ugly hack comes from Sun bug database: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6292739
+        // This ugly hack comes from Sun bug database: https://bugs.openjdk.java.net/browse/JDK-6292739
         try {
             Field field = Toolkit.class.getDeclaredField("resources");
@@ -1271,6 +1271,6 @@
         // Workaround to fix another Java bug
         // Force Java 7 to use old sorting algorithm of Arrays.sort (fix #8712).
-        // See Oracle bug database: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7075600
-        // and http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6923200
+        // See Oracle bug database: https://bugs.openjdk.java.net/browse/JDK-7075600
+        // and https://bugs.openjdk.java.net/browse/JDK-6923200
         if (Main.pref.getBoolean("jdk.Arrays.useLegacyMergeSort", !Version.getInstance().isLocalBuild())) {
             updateSystemProperty("java.util.Arrays.useLegacyMergeSort", "true");
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java	(revision 6616)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java	(revision 6617)
@@ -15,5 +15,5 @@
 /**
  * A subclass of {@link JPasswordField} to implement a workaround to 
- * <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6322854">JDK bug 6322854</a>.
+ * <a href="https://bugs.openjdk.java.net/browse/JDK-6322854">JDK bug 6322854</a>.
  * This class can be deleted after Oracle decides to fix this bug...
  * 
@@ -91,5 +91,5 @@
     
     /**
-     * Implements a workaround to <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6322854">JDK bug 6322854</a>.
+     * Implements a workaround to <a href="https://bugs.openjdk.java.net/browse/JDK-6322854">JDK bug 6322854</a>.
      * @param text The {@link JTextComponent} to protect.
      */
@@ -107,5 +107,5 @@
                         Main.error("NullPointerException occured because of JDK bug 6322854. "
                                 +"Copy/Paste operation has not been performed. Please complain to Oracle: "+
-                                "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6322854");
+                                "https://bugs.openjdk.java.net/browse/JDK-6322854");
                     }
                 }
Index: trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 6616)
+++ trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 6617)
@@ -279,5 +279,5 @@
      * Manually follows redirects because
      * {@link HttpURLConnection#setFollowRedirects(boolean)} fails if the redirect
-     * is going from a http to a https URL, see <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4620571">bug report</a>.
+     * is going from a http to a https URL, see <a href="https://bugs.openjdk.java.net/browse/JDK-4620571">bug report</a>.
      * <p>
      * This can causes problems when downloading from certain GitHub URLs.
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6616)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6617)
@@ -752,5 +752,5 @@
      * An alternative to {@link String#trim()} to effectively remove all leading and trailing white characters, including Unicode ones.
      * @see <a href="http://closingbraces.net/2008/11/11/javastringtrim/">Java’s String.trim has a strange idea of whitespace</a>
-     * @see <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4080617">JDK bug 4080617</a>
+     * @see <a href="https://bugs.openjdk.java.net/browse/JDK-4080617">JDK bug 4080617</a>
      * @param str The string to strip
      * @return <code>str</code>, without leading and trailing characters, according to