Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 6995)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 6997)
@@ -16,4 +16,5 @@
 import java.net.URISyntaxException;
 import java.util.Arrays;
+import java.util.Calendar;
 
 import javax.swing.JOptionPane;
@@ -360,4 +361,11 @@
 
     protected void askUpdateJava(final String version, final String url) {
+        // Expiration date of this feature around the expected release of our first Java 7 tested version
+        Calendar today = Calendar.getInstance();
+        Calendar expiration = Calendar.getInstance();
+        expiration.set(2014, Calendar.MAY, 25);
+        if (!today.before(expiration)) {
+            return;
+        }
         GuiHelper.runInEDTAndWait(new Runnable() {
             @Override