This is an automated email from the ASF dual-hosted git repository. mbien pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 4ce6abc327 version bumps: require javac 18. new 9d5defe761 Merge pull request #3953 from mbien/javac-requirements-bump 4ce6abc327 is described below commit 4ce6abc327ef65d533f3a9212c5fecea3d249f83 Author: Michael Bien <mbie...@gmail.com> AuthorDate: Sun Apr 10 20:11:08 2022 +0200 version bumps: require javac 18. --- .../src/org/netbeans/modules/java/source/NoJavacHelper.java | 9 +++++---- .../src/org/netbeans/modules/java/source/JBrowseModule.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java b/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java index 539cb88ca9..2085580a85 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java @@ -34,21 +34,22 @@ import org.openide.modules.OnStart; */ public class NoJavacHelper { - private static final boolean hasWorkingJavac; + public static final int REQUIRED_JAVAC_VERSION = 18; // <- TODO: increment on every release + private static final boolean HAS_WORKING_JAVAC; static { boolean res; try { - SourceVersion.valueOf("RELEASE_17"); + SourceVersion.valueOf("RELEASE_"+REQUIRED_JAVAC_VERSION); res = true; } catch (IllegalArgumentException ex) { res = false; } - hasWorkingJavac = res; + HAS_WORKING_JAVAC = res; } public static boolean hasWorkingJavac() { - return hasWorkingJavac; + return HAS_WORKING_JAVAC; } // safety net if someone manages to start NB on JDK 8 with nb-javac uninstalled diff --git a/java/java.source/src/org/netbeans/modules/java/source/JBrowseModule.java b/java/java.source/src/org/netbeans/modules/java/source/JBrowseModule.java index f6410ab8eb..2772793d9d 100644 --- a/java/java.source/src/org/netbeans/modules/java/source/JBrowseModule.java +++ b/java/java.source/src/org/netbeans/modules/java/source/JBrowseModule.java @@ -62,7 +62,7 @@ public class JBrowseModule extends ModuleInstall { " Please either:" + "<ul>" + "<li>install nb-javac library (<b>highly recommended</b>)</li>" + - "<li>run NetBeans on JDK 17 or later</li>" + + "<li>run NetBeans on JDK "+NoJavacHelper.REQUIRED_JAVAC_VERSION+" or later</li>" + "</ul>", "BN_Install=Install nb-javac", "DN_nbjavac=nb-javac library", --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists