This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch release111
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 73bb7862724af663e20d104734d9d4c9ec382b50
Merge: f56623c 43fabe6
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Wed Jul 3 14:25:27 2019 +0100
Merge pull request #1353 from apache/master
Sync master to release branch for NB 11.1-beta3
.../java/hints/errors/EnablePreviewAntProj.java | 217 ++++++++++++
.../modules/apisupport/project/resources/layer.xml | 1 +
.../modules/maven/apisupport/AccessQueryImpl.java | 4 +-
.../AddOSGiParamToNbmPluginConfiguration.java | 6 +-
.../apisupport/CoSApplicationLateBoundChecker.java | 3 +-
.../modules/maven/apisupport/InstallerPanel.java | 11 +-
.../maven/apisupport/MavenNbModuleImpl.java | 59 ++--
.../apisupport/MavenRefactoringProviderImpl.java | 4 +-
.../maven/apisupport/MavenWhiteListQueryImpl.java | 4 +-
.../modules/maven/apisupport/NBMNativeMWI.java | 53 ++-
.../maven/apisupport/NbmActionGoalProvider.java | 5 +-
.../maven/apisupport/NbmWizardIterator.java | 15 +-
.../maven/apisupport/NbmWizardPanelVisual.java | 10 +-
.../apisupport/NetBeansRunParamsIDEChecker.java | 7 +-
.../maven/apisupport/OpenBrandingEditorAction.java | 3 +-
.../apisupport/PluginBackwardPropertyUtils.java | 93 ++++++
.../maven/apisupport/PublicPackagesPanel.java | 9 +-
.../amazon/AmazonServerInstanceImplementation.java | 9 +-
.../AmazonJ2EEServerInstanceImplementation.java | 6 +-
.../common/registration/AutomaticRegistration.java | 11 +-
.../glassfish/tooling/data/GlassFishVersion.java | 4 +-
.../server/config/ConfigBuilderProvider.java | 2 +-
.../j2ee/common/J2eeProjectCapabilities.java | 1 +
.../src/org/netbeans/api/j2ee/core/Profile.java | 2 +-
.../deployment/devmodules/api/ServerManager.java | 10 +-
.../impl/bridge/BridgingServerInstance.java | 5 +
.../modules/j2ee/deployment/impl/layer.xml | 11 +-
.../impl/ui/wizard/AddServerInstanceWizard.java | 305 -----------------
.../deployment/impl/ui/wizard/Bundle.properties | 51 ---
.../impl/ui/wizard/ServerChooserPanel.java | 97 ------
.../impl/ui/wizard/ServerChooserVisual.form | 152 ---------
.../impl/ui/wizard/ServerChooserVisual.java | 363 ---------------------
.../archetype/BaseJ2eeArchetypeProvider.java | 2 +-
.../ui/wizard/archetype/J2eeArchetypeFactory.java | 14 +-
enterprise/payara.common/manifest.mf | 2 +-
enterprise/payara.common/nbproject/project.xml | 2 +-
.../payara.eecommon/nbproject/project.properties | 2 +-
enterprise/payara.eecommon/nbproject/project.xml | 4 +-
.../dd/loader/PayaraDescriptorDataObject.java | 4 +-
enterprise/payara.jakartaee/manifest.mf | 2 +-
enterprise/payara.jakartaee/nbproject/project.xml | 6 +-
.../payara/jakartaee/Hk2JavaEEPlatformImpl.java | 4 +-
.../modules/payara/jakartaee/Hk2JaxWsStack.java | 4 +-
enterprise/payara.micro/manifest.mf | 2 +-
.../netbeans/modules/fish/payara/micro/layer.xml | 2 -
.../micro/project/ui/BaseWizardIterator.java | 3 +
.../project/ui/MicroProjectWizardIterator.java | 22 +-
enterprise/payara.tooling/manifest.mf | 2 +-
.../websvc/rest/nodes/RestServicesNodeFactory.java | 5 +
groovy/gradle.java/nbproject/project.xml | 19 ++
.../java/output/JavaCompilerProcessorFactory.java | 14 +-
.../java/queries/GradleSourceForRepository.java | 24 +-
.../output/JavaCompilerProcessorFactoryTest.java | 67 ++++
groovy/gradle.javaee/manifest.mf | 1 -
.../gradle/javaee/GradleJavaEEProjectSettings.java | 11 +-
.../customizer/GradleCompositePanelProvider.java | 36 +-
.../org/netbeans/modules/gradle/javaee/layer.xml | 67 ----
.../web/newproject/ServerSelectionPanelVisual.java | 4 +-
.../newproject/WebApplicationProjectWizard.java | 6 +
.../modules/gradle/TemplateAttrProvider.java | 21 +-
.../actions/ActionMappingPropertyReader.java | 35 +-
.../modules/gradle/api/output/OutputListeners.java | 26 +-
.../modules/gradle/customizer/Bundle.properties | 2 +-
.../gradle/customizer/LicenseHeadersPanel.form | 2 +-
.../gradle/customizer/LicenseHeadersPanel.java | 2 +-
.../gradle/output/GradleProcessorFactory.java | 85 +++--
.../actions/ActionMappingPropertyReaderTest.java | 47 ++-
.../gradle/api/output/OutputDisplayerMock.java | 65 ++++
.../gradle/output/GradleProcessorFactoryTest.java | 215 ++++++++++++
.../nbproject/org-netbeans-modules-server.sig | 1 +
ide/server/nbproject/project.xml | 2 +
.../org/netbeans/api/server/ServerInstance.java | 13 +
.../server/ui/wizard/AddServerInstanceWizard.java | 24 +-
.../spi/server/ServerInstanceImplementation.java | 11 +
.../server/test/MockInstanceImplementation.java | 6 +
.../editor/java/JavaCodeTemplateProcessor.java | 10 +-
.../editor/java/JavaCodeTemplateProcessorTest.java | 99 ++++++
.../modules/java/hints/errors/Utilities.java | 48 ++-
.../hints/jdk/ConvertSwitchToRuleSwitchTest.java | 81 ++++-
.../modules/java/source/parsing/JavacParser.java | 43 ++-
.../source/parsing/ParameterNameProviderImpl.java | 5 +-
.../java/source/parsing/JavacParserTest.java | 45 ++-
.../parsing/ParameterNameProviderImplTest.java | 33 +-
.../modules/jshell/editor/ResetAction.java | 2 +-
.../netbeans/modules/jshell/resources/layer.xml | 3 -
.../modules/maven/hints/errors/Bundle.properties | 1 +
.../maven/hints/errors/EnablePreviewMavenProj.java | 286 ++++++++++++++++
.../src/org/netbeans/modules/maven/hints/layer.xml | 1 +
.../panels/netbeans/NbPreInstallSummaryPanel.java | 2 +-
.../org/netbeans/core/ui/sampler/selfSampler.png | Bin 913 -> 1357 bytes
.../org/netbeans/core/ui/sampler/selfSampler24.png | Bin 1704 -> 2146 bytes
.../core/ui/sampler/selfSamplerRunning.png | Bin 859 -> 1351 bytes
.../core/ui/sampler/selfSamplerRunning24.png | Bin 1563 -> 2133 bytes
.../netbeans/modules/masterfs/ui/suspend/pause.png | Bin 928 -> 1360 bytes
.../modules/masterfs/ui/suspend/pause24.png | Bin 1531 -> 2183 bytes
.../html/ojet/ui/OJETFrameworkCustomizer.java | 7 +-
.../bower/ui/libraries/LibraryCustomizer.java | 14 +-
.../modules/javascript/cdnjs/CDNJSLibraries.java | 14 +-
.../nodejs/ui/libraries/LibraryCustomizer.java | 14 +-
.../javascript2/editor/api/FrameworksUtils.java | 5 +-
.../editor/ui/ECMAVersionCustomizer.java | 8 +-
.../requirejs/ui/RequireJsCustomizer.java | 7 +-
webcommon/libs.graaljs/nbproject/project.xml | 8 +-
.../src/org/netbeans/libs/graaljs/GraalJSTest.java | 63 +++-
webcommon/libs.truffleapi/manifest.mf | 2 +-
webcommon/libs.truffleapi/nbproject/project.xml | 1 +
.../JsLibsCompositeCategoryProvider.java | 8 +
107 files changed, 1823 insertions(+), 1408 deletions(-)
---------------------------------------------------------------------
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
