This is an automated email from the ASF dual-hosted git repository.
neilcsmith 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 6b6c408 Update Installer and AutoUpgrade to look for 11.0 userdir.
new f02daac Merge pull request #1302 from neilcsmith-net/update-upgrader
6b6c408 is described below
commit 6b6c4082be6c8830302450f2f3bc3fe8efb74239
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Mon Jun 17 12:16:29 2019 +0100
Update Installer and AutoUpgrade to look for 11.0 userdir.
---
.../src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java | 2 +-
nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java | 2 +-
2 files changed, 2 insertions(+), 2 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 546525b..42852a2 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 ("10.0", "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
+ Arrays.asList ("11.0", "10.0", "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/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java
b/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java
index b8c16f2..0d87279 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 ("10.0", "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
+ Arrays.asList ("11.0", "10.0", "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
