This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a commit to branch release100 in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/release100 by this push: new 6f9880e [NETBEANS-1371] Updated Importers to look for NetBeans 9.0 installation 6f9880e is described below commit 6f9880e7d3da16d936625ee5cdb28d1fa2b5af85 Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com> AuthorDate: Sat Oct 6 15:17:38 2018 -0700 [NETBEANS-1371] Updated Importers to look for NetBeans 9.0 installation --- .../src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java | 2 +- nb/ide.launcher/netbeans.conf | 4 ++-- nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java index dc3a09d..c7fc1ed 100644 --- a/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java +++ b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java @@ -51,7 +51,7 @@ public class Installer extends ModuleInstall { private static final List<String> VERSION_TO_CHECK = Arrays.asList (".netbeans/7.1.2", ".netbeans/7.1.1", ".netbeans/7.1", ".netbeans/7.0", ".netbeans/6.9"); //NOI18N private static final List<String> NEWER_VERSION_TO_CHECK = - Arrays.asList ("8.2", "8.1", "8.0.2", "8.0.1", "8.0", "7.4", "7.3.1", "7.3", "7.2.1", "7.2"); //NOI18N + Arrays.asList ("9.0", "8.2", "8.1", "8.0.2", "8.0.1", "8.0", "7.4", "7.3.1", "7.3", "7.2.1", "7.2"); //NOI18N private static final String IMPORTED = "imported"; // NOI18N @Override diff --git a/nb/ide.launcher/netbeans.conf b/nb/ide.launcher/netbeans.conf index e6d7cdf..f839cce 100644 --- a/nb/ide.launcher/netbeans.conf +++ b/nb/ide.launcher/netbeans.conf @@ -45,8 +45,8 @@ # Cachedir must be different from userdir. The same cachedir and userdir # would cause problems. # -netbeans_default_userdir="${DEFAULT_USERDIR_ROOT}/dev" -netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev" +netbeans_default_userdir="${DEFAULT_USERDIR_ROOT}/10.0" +netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/10.0" # Options used by NetBeans launcher by default: # (can be overridden by explicit command line switches) diff --git a/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java index 8bb89e1..646a534 100644 --- a/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java +++ b/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java @@ -93,7 +93,7 @@ public final class AutoUpgrade { // userdir on OS specific root of userdir (see issue 196075) static final List<String> NEWER_VERSION_TO_CHECK = - Arrays.asList ("8.2", "8.1", "8.0.2", "8.0.1", "8.0", "7.4", "7.3.1", "7.3", "7.2.1", "7.2"); //NOI18N + Arrays.asList ("9.0", "8.2", "8.1", "8.0.2", "8.0.1", "8.0", "7.4", "7.3.1", "7.3", "7.2.1", "7.2"); //NOI18N private static File checkPreviousOnOsSpecificPlace (final List<String> versionsToCheck) { --------------------------------------------------------------------- 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