You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ne...@apache.org on 2019/07/13 09:48:39 UTC
[netbeans] 01/01: Merge pull request #1374 from apache/master
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 d9ec4e569177f19413439e1775707928cc93e1a5
Merge: a4a76a5 ab4e095
Author: Neil C Smith <ne...@apache.org>
AuthorDate: Sat Jul 13 10:48:31 2019 +0100
Merge pull request #1374 from apache/master
Sync master to release branch for NB 11.1-beta4
.travis.yml | 1 +
enterprise/j2ee.dd/.gitignore | 5 +-
enterprise/j2ee.dd/build.xml | 1413 +++++++++--------
enterprise/j2ee.dd/licenseinfo.xml | 3 +
.../modules/j2ee/dd/impl/common/DDUtils.java | 16 +-
.../j2ee/dd/impl/resources/application_8.mdd | 1002 ++++++++++++
.../modules/j2ee/dd/impl/resources/web-app_4_0.mdd | 880 +++++++++++
.../j2ee/dd/impl/resources/web-fragment_4_0.mdd | 1596 ++++++++++++++++++++
.../modules/j2ee/dd/impl/web/WebAppProxy.java | 11 +-
.../modules/j2ee/dd/impl/web/WebParseUtils.java | 32 +-
.../j2ee/ddloaders/catalog/EnterpriseCatalog.java | 28 +-
.../nbproject/org-netbeans-libs-elimpl.sig | 2 +-
.../libs.elimpl/nbproject/project.properties | 2 +
.../payara/micro/project/MicroApplication.java | 6 +-
.../htmlui/resources/desktop_build.gradle.fmk | 15 +-
.../gradle/htmlui/resources/root_build.gradle.fmk | 2 +-
.../gradle/htmlui/resources/web_build.gradle.fmk | 3 +
.../javaee/api/ui/support/CheckBoxUpdater.java | 42 -
.../javaee/api/ui/support/ComboBoxUpdater.java | 42 -
.../gradle/javaee/web/AdditionalWebProvider.java | 41 -
.../web/CssPreprocessorsProblemProvider.java | 41 -
.../gradle/javaee/web/CssPreprocessorsSupport.java | 42 -
.../modules/gradle/javaee/web/WebEjbJarImpl.java | 41 -
.../gradle/javaee/web/WebRecoPrivTemplates.java | 41 -
.../lsp/client/bindings/HyperlinkProviderImpl.java | 5 +
.../TextDocumentSyncServerCapabilityHandler.java | 2 +
.../org-netbeans-modules-java-api-common.sig | 11 +-
.../common/SingleJavaSourceRunActionProvider.java | 4 +-
nbbuild/notice-stub.txt | 2 +-
29 files changed, 4352 insertions(+), 979 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists