Index: .classpath =================================================================== --- .classpath (revision 10318) +++ .classpath (working copy) @@ -19,7 +19,7 @@ - + Index: .settings/org.eclipse.jdt.core.prefs =================================================================== --- .settings/org.eclipse.jdt.core.prefs (revision 10318) +++ .settings/org.eclipse.jdt.core.prefs (working copy) @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -99,6 +99,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning @@ -111,7 +112,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 Index: .settings/sf.eclipse.javacc.prefs =================================================================== --- .settings/sf.eclipse.javacc.prefs (revision 10318) +++ .settings/sf.eclipse.javacc.prefs (working copy) @@ -1,5 +1,5 @@ CLEAR_CONSOLE=true -JAVACC_OPTIONS=-JDK_VERSION\=1.7 -GRAMMAR_ENCODING\=UTF-8 +JAVACC_OPTIONS=-JDK_VERSION\=1.8 -GRAMMAR_ENCODING\=UTF-8 JJDOC_OPTIONS= JJTREE_OPTIONS= JJ_NATURE=true Index: README =================================================================== --- README (revision 10318) +++ README (working copy) @@ -9,12 +9,12 @@ To run JOSM, you need: * The JOSM .jar file, e.g., josm-tested.jar or josm-latest.jar -* Java Runtime Environment (JRE) 7, or later. +* Java Runtime Environment (JRE) 8, or later. How to get Java Runtime Environment ----------------------------------- -You need JRE Version 7, or later. +You need JRE Version 8, or later. Microsoft Windows and Apple Mac OS X users should visit https://www.java.com and download the latest Java executable for their system. @@ -116,7 +116,7 @@ - tools/ libraries and tools that help in the development process - animal-sniffer-ant-tasks-1.14.jar used to build and check code signatures to ensure plugins binary compatibility - - appbundler-1.0ea.jar used to build Mac OS X package for Oracle Java 7 + - appbundler-1.0ea.jar used to build Mac OS X package for Oracle Java 8 - checkstyle/ libs and config files for checkstyle (automatically detects code style problems in source code); can be launched as an ant target in build.xml - commons-cli-1.3.1.jar dependency of Groovy Ant task Index: build.xml =================================================================== --- build.xml (revision 10318) +++ build.xml (working copy) @@ -211,7 +211,7 @@ - + @@ -220,7 +220,7 @@ + destdir="build" target="1.8" source="1.8" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false"> @@ -244,7 +244,7 @@ + destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8"> @@ -261,7 +261,7 @@ + destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8"> @@ -299,7 +299,7 @@ private="true" linksource="true" author="false"> - + JOSM - Javadoc]]> JOSM]]> @@ -352,7 +352,7 @@ - + @@ -699,7 +699,7 @@ Index: eclipse/JOSM (Java 7).launch =================================================================== --- eclipse/JOSM (Java 7).launch (revision 10318) +++ eclipse/JOSM (Java 7).launch (working copy) @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - Index: josm-latest.jnlp =================================================================== --- josm-latest.jnlp (revision 10318) +++ josm-latest.jnlp (working copy) @@ -19,7 +19,7 @@ - + Index: josm.jnlp =================================================================== --- josm.jnlp (revision 10318) +++ josm.jnlp (working copy) @@ -19,7 +19,7 @@ - + Index: linux/latest/DEBIAN/control =================================================================== --- linux/latest/DEBIAN/control (revision 10318) +++ linux/latest/DEBIAN/control (working copy) @@ -5,7 +5,7 @@ Homepage: https://josm.openstreetmap.de Priority: extra Architecture: all -Depends: openjdk-8-jre | java7-runtime +Depends: openjdk-8-jre | java8-runtime Description: Editor for OpenStreetMap (daily development snapshot) JOSM is an editor for OpenStreetMap (OSM) written in Java. The current version supports stand alone GPX tracks, GPX track data Index: linux/latest/usr/bin/josm-latest =================================================================== --- linux/latest/usr/bin/josm-latest (revision 10318) +++ linux/latest/usr/bin/josm-latest (working copy) @@ -2,8 +2,10 @@ # Simple wrapper script used to start JOSM in Debian set -e -# First, users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK. +# First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK. # Override to a specific one using $JAVACMD +ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`" + # Let's get the current architecture -- needed for multiarchified Java ARCH="`dpkg --print-architecture 2> /dev/null || true`" @@ -11,12 +13,10 @@ if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then JAVA_CMDS="$JAVA_HOME/bin/java" JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java" - JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java" JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java" else JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java" JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java" - JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-oracle/bin/java" JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java" fi @@ -24,6 +24,15 @@ if [ -z "${JAVACMD}" ]; then for jcmd in $JAVA_CMDS; do + if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then + JAVACMD="$jcmd" + break + fi + done +fi + +if [ -z "${JAVACMD}" ]; then + for jcmd in $JAVA_CMDS; do if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then JAVACMD="$jcmd" break Index: linux/latest/usr/share/man/man1/josm-latest.1 =================================================================== --- linux/latest/usr/share/man/man1/josm-latest.1 (revision 10318) +++ linux/latest/usr/share/man/man1/josm-latest.1 (working copy) @@ -1,4 +1,4 @@ -.TH JOSM 1 "December 20, 2014" +.TH JOSM 1 "May 13, 2016" .\" Please adjust this date whenever revising the manpage. .SH NAME josm \- Java OpenStreetMap Editor @@ -6,7 +6,7 @@ .B josm-latest .SH DESCRIPTION .B JOSM -is an editor for OpenStreetMap written in Java 7. +is an editor for OpenStreetMap written in Java 8. .PP .B OpenStreetMap is a project aimed squarely at creating and providing free geographic data such as street maps to anyone Index: linux/tested/DEBIAN/control =================================================================== --- linux/tested/DEBIAN/control (revision 10318) +++ linux/tested/DEBIAN/control (working copy) @@ -5,7 +5,7 @@ Homepage: https://josm.openstreetmap.de Priority: extra Architecture: all -Depends: openjdk-8-jre | java7-runtime +Depends: openjdk-8-jre | java8-runtime Conflicts: josm-plugins Replaces: josm-plugins Description: Editor for OpenStreetMap Index: linux/tested/usr/bin/josm =================================================================== --- linux/tested/usr/bin/josm (revision 10318) +++ linux/tested/usr/bin/josm (working copy) @@ -2,8 +2,10 @@ # Simple wrapper script used to start JOSM in Debian set -e -# First, users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK. +# First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK. # Override to a specific one using $JAVACMD +ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`" + # Let's get the current architecture -- needed for multiarchified Java ARCH="`dpkg --print-architecture 2> /dev/null || true`" @@ -11,12 +13,10 @@ if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then JAVA_CMDS="$JAVA_HOME/bin/java" JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java" - JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java" JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java" else JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java" JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java" - JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-oracle/bin/java" JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java" fi @@ -24,6 +24,15 @@ if [ -z "${JAVACMD}" ]; then for jcmd in $JAVA_CMDS; do + if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then + JAVACMD="$jcmd" + break + fi + done +fi + +if [ -z "${JAVACMD}" ]; then + for jcmd in $JAVA_CMDS; do if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then JAVACMD="$jcmd" break Index: linux/tested/usr/share/man/man1/josm.1 =================================================================== --- linux/tested/usr/share/man/man1/josm.1 (revision 10318) +++ linux/tested/usr/share/man/man1/josm.1 (working copy) @@ -1,4 +1,4 @@ -.TH JOSM 1 "December 20, 2014" +.TH JOSM 1 "May 13, 2016" .\" Please adjust this date whenever revising the manpage. .SH NAME josm \- Java OpenStreetMap Editor @@ -6,7 +6,7 @@ .B josm .SH DESCRIPTION .B JOSM -is an editor for OpenStreetMap written in Java 7. +is an editor for OpenStreetMap written in Java 8. .PP .B OpenStreetMap is a project aimed squarely at creating and providing free geographic data such as street maps to anyone Index: netbeans/nbproject/project.properties =================================================================== --- netbeans/nbproject/project.properties (revision 10318) +++ netbeans/nbproject/project.properties (working copy) @@ -60,8 +60,8 @@ javac.deprecation=true javac.processorpath=\ ${javac.classpath} -javac.source=1.7 -javac.target=1.7 +javac.source=1.8 +javac.target=1.8 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir}:\ Index: src/org/openstreetmap/josm/Main.java =================================================================== --- src/org/openstreetmap/josm/Main.java (revision 10318) +++ src/org/openstreetmap/josm/Main.java (working copy) @@ -999,7 +999,7 @@ UIManager.put("OptionPane.cancelIcon", ImageProvider.get("cancel")); UIManager.put("OptionPane.noIcon", UIManager.get("OptionPane.cancelIcon")); // Ensures caret color is the same than text foreground color, see #12257 - // See http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/synth/doc-files/componentProperties.html + // See http://docs.oracle.com/javase/8/docs/api/javax/swing/plaf/synth/doc-files/componentProperties.html for (String p : Arrays.asList( "EditorPane", "FormattedTextField", "PasswordField", "TextArea", "TextField", "TextPane")) { UIManager.put(p+".caretForeground", UIManager.getColor(p+".foreground")); @@ -1332,31 +1332,21 @@ } /** - * Determines if JOSM currently runs with Java 8 or later. - * @return {@code true} if the current JVM is at least Java 8, {@code false} otherwise - * @since 7894 - */ - public static boolean isJava8orLater() { - String version = System.getProperty("java.version"); - return version != null && !version.matches("^(1\\.)?[7].*"); - } - - /** - * Checks that JOSM is at least running with Java 7. + * Checks that JOSM is at least running with Java 8. * @since 7001 */ public static void checkJavaVersion() { String version = System.getProperty("java.version"); if (version != null) { - if (version.matches("^(1\\.)?[789].*")) + if (version.matches("^(1\\.)?[89].*")) return; - if (version.matches("^(1\\.)?[56].*")) { + if (version.matches("^(1\\.)?[567].*")) { JMultilineLabel ho = new JMultilineLabel(""+ tr("

JOSM requires Java version {0}.

"+ "Detected Java version: {1}.
"+ "You can
  • update your Java (JRE) or
    • "+ "
  • use an earlier (Java {2} compatible) version of JOSM.
"+ - "More Info:", "7", version, "6")+""); + "More Info:", "8", version, "7")+""); JTextArea link = new JTextArea(HelpUtil.getWikiBaseHelpUrl()+"/Help/SystemRequirements"); link.setEditable(false); link.setBackground(panel.getBackground()); Index: src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- src/org/openstreetmap/josm/data/Preferences.java (revision 10318) +++ src/org/openstreetmap/josm/data/Preferences.java (working copy) @@ -1335,13 +1335,6 @@ if (getBoolean("jdk.tls.disableSNIExtension", false)) { Utils.updateSystemProperty("jsse.enableSNIExtension", "false"); } - // Workaround to fix another Java bug - The bug seems to have been fixed in Java 8, to remove during transition - // Force Java 7 to use old sorting algorithm of Arrays.sort (fix #8712). - // See Oracle bug database: https://bugs.openjdk.java.net/browse/JDK-7075600 - // and https://bugs.openjdk.java.net/browse/JDK-6923200 - if (getBoolean("jdk.Arrays.useLegacyMergeSort", !Version.getInstance().isLocalBuild())) { - Utils.updateSystemProperty("java.util.Arrays.useLegacyMergeSort", "true"); - } } /** Index: src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java =================================================================== --- src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 10318) +++ src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (working copy) @@ -45,9 +45,7 @@ import sun.security.x509.BasicConstraintsExtension; import sun.security.x509.CertificateAlgorithmId; import sun.security.x509.CertificateExtensions; -import sun.security.x509.CertificateIssuerName; import sun.security.x509.CertificateSerialNumber; -import sun.security.x509.CertificateSubjectName; import sun.security.x509.CertificateValidity; import sun.security.x509.CertificateVersion; import sun.security.x509.CertificateX509Key; @@ -148,20 +146,9 @@ info.set(X509CertInfo.VALIDITY, interval); info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(sn)); + info.set(X509CertInfo.SUBJECT, owner); + info.set(X509CertInfo.ISSUER, owner); - // Change of behaviour in JDK8: - // https://bugs.openjdk.java.net/browse/JDK-8040820 - // https://bugs.openjdk.java.net/browse/JDK-7198416 - if (!Main.isJava8orLater()) { - // Java 7 code. To remove with Java 8 migration - info.set(X509CertInfo.SUBJECT, new CertificateSubjectName(owner)); - info.set(X509CertInfo.ISSUER, new CertificateIssuerName(owner)); - } else { - // Java 8 and later code - info.set(X509CertInfo.SUBJECT, owner); - info.set(X509CertInfo.ISSUER, owner); - } - info.set(X509CertInfo.KEY, new CertificateX509Key(pair.getPublic())); info.set(X509CertInfo.VERSION, new CertificateVersion(CertificateVersion.V3)); AlgorithmId algo = new AlgorithmId(AlgorithmId.md5WithRSAEncryption_oid); Index: src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- src/org/openstreetmap/josm/tools/ImageProvider.java (revision 10318) +++ src/org/openstreetmap/josm/tools/ImageProvider.java (working copy) @@ -888,7 +888,7 @@ // See #10479: for PNG files, always enforce transparency to be sure tNRS chunk is used even not in paletted mode // This can be removed if someday Oracle fixes https://bugs.openjdk.java.net/browse/JDK-6788458 // CHECKSTYLE.OFF: LineLength - // hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/828c4fedd29f/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656 + // hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/dc4322602480/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656 // CHECKSTYLE.ON: LineLength Image img = read(new ByteArrayInputStream(bytes), false, true); return img == null ? null : new ImageResource(img); @@ -1013,7 +1013,7 @@ try { // See #10479: for PNG files, always enforce transparency to be sure tNRS chunk is used even not in paletted mode // This can be removed if someday Oracle fixes https://bugs.openjdk.java.net/browse/JDK-6788458 - // hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/828c4fedd29f/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656 + // hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/dc4322602480/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656 img = read(path, false, true); if (Main.isDebugEnabled() && isTransparencyForced(img)) { Main.debug("Transparency has been forced for image "+path.toExternalForm()); @@ -1670,7 +1670,7 @@ * @param reader The image reader * @return the {@code TransparentColor} defined in image reader metadata, or {@code null} * @throws IOException if an error occurs during reading - * @see javax_imageio_1.0 metadata + * @see javax_imageio_1.0 metadata * @since 7499 */ public static Color getTransparentColor(ColorModel model, ImageReader reader) throws IOException { Index: src/org/openstreetmap/josm/tools/PlatformHookOsx.java =================================================================== --- src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 10318) +++ src/org/openstreetmap/josm/tools/PlatformHookOsx.java (working copy) @@ -73,11 +73,6 @@ // We'll just ignore this for now. The user will still be able to close JOSM by closing all its windows. Main.warn("Failed to register with OSX: " + ex); } - // Invite users to install Java 8 if they are still with Java 7 - String java = System.getProperty("java.version"); - if (java != null && java.startsWith("1.7")) { - askUpdateJava(java); - } } protected void setHandlers(Class appClass, Class quitHandler, Class aboutHandler, Index: src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java =================================================================== --- src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 10318) +++ src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (working copy) @@ -112,24 +112,7 @@ @Override public void startupHook() { - if (isDebianOrUbuntu()) { - // Invite users to install Java 8 if they are still with Java 7 and using a compatible distrib (Debian >= 8 or Ubuntu >= 15.10) - String java = System.getProperty("java.version"); - String os = getOSDescription(); - if (java != null && java.startsWith("1.7") && os != null && ( - os.startsWith("Linux Debian GNU/Linux 8") || os.matches("^Linux Ubuntu 1[567].*"))) { - String url; - // apturl does not exist on Debian (see #8465) - if (os.startsWith("Linux Debian")) { - url = "https://packages.debian.org/jessie-backports/openjdk-8-jre"; - } else if (getPackageDetails("apturl") != null) { - url = "apt://openjdk-8-jre"; - } else { - url = "http://packages.ubuntu.com/xenial/openjdk-8-jre"; - } - askUpdateJava(java, url); - } - } + // Do nothing } @Override @@ -266,8 +249,10 @@ */ public String getJavaPackageDetails() { String home = System.getProperty("java.home"); - if (home.contains("java-7-openjdk") || home.contains("java-1.7.0-openjdk")) { - return getPackageDetails("openjdk-7-jre", "java-1_7_0-openjdk", "java-1.7.0-openjdk"); + if (home.contains("java-8-openjdk") || home.contains("java-1.8.0-openjdk")) { + return getPackageDetails("openjdk-8-jre", "java-1_8_0-openjdk", "java-1.8.0-openjdk"); + } else if (home.contains("java-9-openjdk") || home.contains("java-1.9.0-openjdk")) { + return getPackageDetails("openjdk-9-jre", "java-1_9_0-openjdk", "java-1.9.0-openjdk"); } else if (home.contains("icedtea")) { return getPackageDetails("icedtea-bin"); } else if (home.contains("oracle")) { @@ -428,12 +413,7 @@ } } - protected void askUpdateJava(String version) { - if (!GraphicsEnvironment.isHeadless()) { - askUpdateJava(version, "https://www.java.com/download"); - } - } - + // Method unused, but kept for translation already done. To reuse during Java 9 migration protected void askUpdateJava(final String version, final String url) { GuiHelper.runInEDTAndWait(new Runnable() { @Override @@ -443,7 +423,7 @@ tr("Outdated Java version"), new String[]{tr("OK"), tr("Update Java"), tr("Cancel")}); // Check if the dialog has not already been permanently hidden by user - if (!ed.toggleEnable("askUpdateJava8").toggleCheckState()) { + if (!ed.toggleEnable("askUpdateJava9").toggleCheckState()) { ed.setButtonIcons(new String[]{"ok", "java", "cancel"}).setCancelButton(3); ed.setMinimumSize(new Dimension(480, 300)); ed.setIcon(JOptionPane.WARNING_MESSAGE); @@ -451,7 +431,7 @@ .append("

"); if ("Sun Microsystems Inc.".equals(System.getProperty("java.vendor")) && !isOpenJDK()) { content.append("").append(tr("This version is no longer supported by {0} since {1} and is not recommended for use.", - "Oracle", tr("April 2015"))).append("

"); + "Oracle", tr("April 2015"))).append("

"); // TODO: change date once Java 8 EOL is announced } content.append("") .append(tr("JOSM will soon stop working with this version; we highly recommend you to update to Java {0}.", "8")) Index: src/org/openstreetmap/josm/tools/PlatformHookWindows.java =================================================================== --- src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 10318) +++ src/org/openstreetmap/josm/tools/PlatformHookWindows.java (working copy) @@ -63,11 +63,7 @@ @Override public void startupHook() { - // Invite users to install Java 8 if they are still with Java 7 - String version = System.getProperty("java.version"); - if (version != null && version.startsWith("1.7")) { - askUpdateJava(version); - } + // Do nothing } private static final byte[] INSECURE_PUBLIC_KEY = new byte[] { Index: test/unit/org/openstreetmap/josm/TestUtils.java =================================================================== --- test/unit/org/openstreetmap/josm/TestUtils.java (revision 10318) +++ test/unit/org/openstreetmap/josm/TestUtils.java (working copy) @@ -164,7 +164,7 @@ /** * Returns the Java version as an int value. - * @return the Java version as an int value (7, 8, 9, etc.) + * @return the Java version as an int value (8, 9, etc.) */ public static int getJavaVersion() { String version = System.getProperty("java.version"); @@ -172,7 +172,6 @@ version = version.substring(2); } // Allow these formats: - // 1.7.0_91 // 1.8.0_72-ea // 9-ea // 9 Index: windows/launch4j.xml =================================================================== --- windows/launch4j.xml (revision 10318) +++ windows/launch4j.xml (working copy) @@ -13,7 +13,7 @@ logo.ico - 1.7.0 + 1.8.0 preferJre %RTBITS%