This is an automated email from the ASF dual-hosted git repository.
mbien pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from bd8966bafd Merge pull request #7169 from
mbien/workaround-graal-test-failures
add 3034cb574e Cleanup NetBeans Upgrader module.
new 3be92f1697 Merge pull request #7155 from
mbien/nb-upgrade-module-cleanup
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
nb/o.n.upgrader/nbproject/project.properties | 3 +-
.../src/org/netbeans/upgrade/AutoUpgrade.java | 145 +++---------------
.../src/org/netbeans/upgrade/AutoUpgradePanel.form | 4 +-
.../src/org/netbeans/upgrade/AutoUpgradePanel.java | 35 +----
.../src/org/netbeans/upgrade/Bundle.properties | 4 -
.../src/org/netbeans/upgrade/ColoringStorage.java | 7 +-
nb/o.n.upgrader/src/org/netbeans/upgrade/Copy.java | 107 +++----------
.../src/org/netbeans/upgrade/CopyFiles.java | 60 ++------
.../src/org/netbeans/upgrade/IncludeExclude.java | 22 ++-
.../src/org/netbeans/upgrade/XMLStorage.java | 6 +-
.../src/org/netbeans/upgrade/copyjstudio_6me_user | 65 --------
.../src/org/netbeans/upgrade/nonstandard5.5 | 29 ----
.../src/org/netbeans/upgrade/nonstandard5.5.1 | 29 ----
.../src/org/netbeans/upgrade/nonstandard6.0 | 31 ----
.../src/org/netbeans/upgrade/nonstandard6.1 | 26 ----
.../src/org/netbeans/upgrade/nonstandard6.5 | 27 ----
.../upgrade/systemoptions/ColorProcessor.java | 6 +-
.../upgrade/systemoptions/ContentProcessor.java | 9 +-
.../systemoptions/CvsSettingsProcessor.java | 66 --------
.../upgrade/systemoptions/DefaultResult.java | 7 +-
.../upgrade/systemoptions/FileProcessor.java | 7 +-
.../upgrade/systemoptions/HashMapProcessor.java | 7 +-
.../upgrade/systemoptions/HashSetProcessor.java | 8 +-
.../systemoptions/HostPropertyProcessor.java | 11 +-
.../netbeans/upgrade/systemoptions/Importer.java | 44 +++---
.../systemoptions/IntrospectedInfoProcessor.java | 6 +-
.../systemoptions/JUnitContentProcessor.java | 3 +-
.../upgrade/systemoptions/ListProcessor.java | 6 +-
.../systemoptions/NbClassPathProcessor.java | 8 +-
.../upgrade/systemoptions/PropertiesStorage.java | 9 +-
.../upgrade/systemoptions/PropertyProcessor.java | 11 +-
.../netbeans/upgrade/systemoptions/SerParser.java | 35 +++--
.../upgrade/systemoptions/SettingsRecognizer.java | 39 ++---
.../systemoptions/StringPropertyProcessor.java | 3 +-
.../upgrade/systemoptions/SystemOptionsParser.java | 8 +-
.../upgrade/systemoptions/TaskTagsProcessor.java | 15 +-
.../upgrade/systemoptions/URLProcessor.java | 10 +-
.../org/netbeans/upgrade/systemoptions/Utils.java | 7 +-
.../upgrade/systemoptions/systemoptionsimport | 2 -
nb/o.n.upgrader/src/org/netbeans/util/Util.java | 8 +-
.../src/org/netbeans/upgrade/AutoUpgradeTest.java | 85 ++---------
.../src/org/netbeans/upgrade/CopyFilesTest.java | 45 +++---
.../unit/src/org/netbeans/upgrade/CopyTest.java | 168 ++++++++++++---------
.../org/netbeans/upgrade/IncludeExcludeTest.java | 1 +
.../unit}/src/org/netbeans/upgrade/copy5.5 | 0
.../unit}/src/org/netbeans/upgrade/copy5.5.1 | 0
.../unit}/src/org/netbeans/upgrade/copy6.0 | 0
.../unit}/src/org/netbeans/upgrade/copy6.1 | 0
.../unit}/src/org/netbeans/upgrade/copy6.5 | 0
.../netbeans/upgrade/launcher/MainCallback.java | 11 +-
.../launcher/PlatformWithAbsolutePathTest.java | 23 +--
.../unit}/src/org/netbeans/upgrade/layer5.5.1.xml | 0
.../unit}/src/org/netbeans/upgrade/layer5.5.xml | 0
.../unit}/src/org/netbeans/upgrade/layer6.0.xml | 0
.../unit}/src/org/netbeans/upgrade/layer6.1.xml | 0
.../upgrade/systemoptions/AntSettingsTest.java | 2 +
.../upgrade/systemoptions/BasicTestForImport.java | 9 +-
.../upgrade/systemoptions/CoreSettingsTest.java | 2 +
.../upgrade/systemoptions/CvsSettingsTest.java | 49 ------
.../upgrade/systemoptions/DataBaseOptionTest.java | 2 +
.../upgrade/systemoptions/DerbyOptionsTest.java | 2 +
.../upgrade/systemoptions/FormSettingsTest.java | 2 +
.../systemoptions/HttpServerSettingsTest.java | 2 +
.../upgrade/systemoptions/I18nOptionsTest.java | 2 +
.../upgrade/systemoptions/IDESettingsTest.java | 2 +
.../upgrade/systemoptions/JUnitSettingsTest.java | 2 +
.../upgrade/systemoptions/JavaSettingsTest.java | 2 +
.../systemoptions/ModuleUISettingsTest.java | 2 +
.../systemoptions/PackageViewSettingsTest.java | 2 +
.../systemoptions/ProjectUIOptionsTest.java | 2 +
.../upgrade/systemoptions/SvnSettingsTest.java | 2 +
.../systemoptions/TaskListSettingsTest.java | 2 +
...g-system-cvss-settings-CvsModuleConfig.settings | 67 --------
73 files changed, 389 insertions(+), 1034 deletions(-)
delete mode 100644
nb/o.n.upgrader/src/org/netbeans/upgrade/copyjstudio_6me_user
delete mode 100644 nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard5.5
delete mode 100644 nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard5.5.1
delete mode 100644 nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.0
delete mode 100644 nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.1
delete mode 100644 nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.5
delete mode 100644
nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/CvsSettingsProcessor.java
rename nb/o.n.upgrader/{ => test/unit}/src/org/netbeans/upgrade/copy5.5 (100%)
rename nb/o.n.upgrader/{ => test/unit}/src/org/netbeans/upgrade/copy5.5.1
(100%)
rename nb/o.n.upgrader/{ => test/unit}/src/org/netbeans/upgrade/copy6.0 (100%)
rename nb/o.n.upgrader/{ => test/unit}/src/org/netbeans/upgrade/copy6.1 (100%)
rename nb/o.n.upgrader/{ => test/unit}/src/org/netbeans/upgrade/copy6.5 (100%)
rename nb/o.n.upgrader/{ => test/unit}/src/org/netbeans/upgrade/layer5.5.1.xml
(100%)
rename nb/o.n.upgrader/{ => test/unit}/src/org/netbeans/upgrade/layer5.5.xml
(100%)
rename nb/o.n.upgrader/{ => test/unit}/src/org/netbeans/upgrade/layer6.0.xml
(100%)
rename nb/o.n.upgrader/{ => test/unit}/src/org/netbeans/upgrade/layer6.1.xml
(100%)
delete mode 100644
nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/CvsSettingsTest.java
delete mode 100644
nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-versioning-system-cvss-settings-CvsModuleConfig.settings
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
