Merge pull request #1361 from apache/master

Sync master to release branch for NB 11.1 vc1.

Author: neilcsmith-net

apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/EnablePreviewAntProj.java

@@ -275,7 +275,6 @@
         <folder name="rules">
             <folder name="errors">
                 <file name="org-netbeans-modules-apisupport-project-java-hints-errors-SearchModuleDependency.instance"/>
-                 <file name="org-netbeans-modules-apisupport-project-java-hints-errors-EnablePreviewAntProj.instance"/>
             </folder>
         </folder>
     </folder>

apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml

@@ -36,6 +36,7 @@
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_6.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_7.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_7.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_8.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_1_4.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_1_4.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_5.mdd</file>
@@ -44,6 +45,7 @@
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_6.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_7.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_7.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_8.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/connector_1_5.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/connector_1_7.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_2_1.mdd</file>
@@ -88,10 +90,12 @@
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_4_0.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-common_3_0.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-common_3_1.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-common_4_0.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_0.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_0.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_4_0.xsd</file>
         <license ref="CDDL-1.1" />
         <comment type="CATEGORY_B" />
     </fileset>