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/10 08:08:01 UTC
[netbeans] 01/01: Merge pull request #1361 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 a4a76a5b548a937e1ba9991c4eb10ff0716fd69c
Merge: 9808114 d48342e
Author: Neil C Smith <ne...@apache.org>
AuthorDate: Wed Jul 10 09:07:52 2019 +0100
Merge pull request #1361 from apache/master
Sync master to release branch for NB 11.1 vc1.
.../java/hints/errors/EnablePreviewAntProj.java | 217 ---
.../modules/apisupport/project/resources/layer.xml | 1 -
enterprise/j2ee.dd/licenseinfo.xml | 4 +
.../dd/impl/resources/application-client_8.xsd | 331 +++++
.../j2ee/dd/impl/resources/application_8.xsd | 414 ++++++
.../modules/j2ee/dd/impl/resources/beans_2_0.xsd | 366 +++++
.../j2ee/dd/impl/resources/web-common_4_0.xsd | 1474 ++++++++++++++++++++
.../j2ee/dd/impl/resources/web-fragment_4_0.xsd | 340 +++++
.../archetype/BaseJ2eeArchetypeProvider.java | 4 +-
.../ui/wizard/archetype/J2eeArchetypeFactory.java | 12 +-
enterprise/servletjspapi/build.xml | 15 +-
enterprise/servletjspapi/external/binaries-list | 2 +
.../external/javax.servlet-api-4.0.0-license.txt | 386 +++++
.../external/javax.servlet-api-4.0.1-license.txt | 386 +++++
.../modules/gradle/ActionProviderImpl.java | 23 +-
.../gradle/execute/GradleDaemonExecutor.java | 2 -
.../java/ui/tree/FolderTreeElement.java | 40 +-
17 files changed, 3757 insertions(+), 260 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