Merge pull request #8976 from matthiasblaesing/jsp_update2

Enable parsing of JSP 3.0 (Jakarta) based sources

Author: matthiasblaesing

.github/workflows/main.yml

@@ -2085,9 +2085,11 @@ jobs:
       - name: web.beans
         run: ant $OPTS -f enterprise/web.beans test
 
-# Fails + Slow
-#      - name: web.core.syntax
-#        run: ant $OPTS -f enterprise/web.core.syntax test
+      - name: web.core
+        run: ant $OPTS -f enterprise/web.core test-unit
+
+      - name: web.core.syntax
+        run: ant $OPTS -f enterprise/web.core.syntax test-unit
 
 # Fails + Slow
 #      - name: web.debug

.gitignore

@@ -52,6 +52,7 @@
 /platform/o.n.bootstrap/launcher/windows/nbproject/Package-*.bash
 /enterprise/web.jspparser/test/unit/data/emptyWebProject/lib/*.jar
 /enterprise/web.jspparser/test/unit/data/project2/lib/*.jar
+/enterprise/web.jspparser/test/unit/data/project2_jakarta/lib/*.jar
 
 # Database logs
 derby.log

enterprise/libs.elimpl/nbproject/project.xml

@@ -31,7 +31,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.1</specification-version>
+                        <specification-version>1.62.0</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>

enterprise/libs.jstl/external/binaries-list

@@ -15,4 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 34A035507F0270F1C6B7722D728BD7B5A9BBAC4C jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7
+3993114CD341AFA42B2C2841C88EF653FA7EF3EE jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.2
 F5A092DE3B2B087C14CA4B8D6F2C77A1F6802828 org.glassfish.web:jakarta.servlet.jsp.jstl:1.2.6
+078909A1354585B2A7A2D3B4E348FCEFF8B6D180 org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.1

enterprise/libs.jstl/external/jakarta.servlet.jsp.jstl-1.2-license.txt

@@ -3,7 +3,7 @@ Version: 1.2
 License: EPL-v20
 Description: Jakarta Standard Tag Library
 Origin: Eclipse Foundation (https://projects.eclipse.org/projects/ee4j.jstl)
-Files: jakarta.servlet.jsp.jstl-1.2.6.jar, jakarta.servlet.jsp.jstl-api-1.2.7.jar
+Files: jakarta.servlet.jsp.jstl-1.2.6.jar, jakarta.servlet.jsp.jstl-api-1.2.7.jar, jakarta.servlet.jsp.jstl-3.0.1.jar, jakarta.servlet.jsp.jstl-api-3.0.2.jar
 
 
 Eclipse Public License - v 2.0

enterprise/libs.jstl/manifest.mf

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.libs.jstl/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jstl/Bundle.properties
-OpenIDE-Module-Implementation-Version: 123
+OpenIDE-Module-Implementation-Version: 124
 OpenIDE-Module-Layer: org/netbeans/libs/jstl/layer.xml
 AutoUpdate-Show-In-Client: false
 

enterprise/libs.jstl/nbproject/project.properties

@@ -19,5 +19,7 @@ javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.8
 release.external/jakarta.servlet.jsp.jstl-api-1.2.7.jar=modules/ext/jstl-api.jar
 release.external/jakarta.servlet.jsp.jstl-1.2.6.jar=modules/ext/jstl-impl.jar
+release.external/jakarta.servlet.jsp.jstl-api-3.0.2.jar=modules/ext/jstl-jakarta-api.jar
+release.external/jakarta.servlet.jsp.jstl-3.0.1.jar=modules/ext/jstl-jakarta-impl.jar
 
-spec.version.base=2.65.0
+spec.version.base=2.66.0

enterprise/libs.jstl/src/org/netbeans/libs/jstl/Bundle.properties

@@ -16,10 +16,12 @@
 # under the License.
 
 # module description
-OpenIDE-Module-Name=Jakarta Standard Tag Library 1.2 (JSTL)
+OpenIDE-Module-Name=Jakarta Standard Tag Library (JSTL)
 OpenIDE-Module-Display-Category=Web
-OpenIDE-Module-Short-Description=Installs the Jakarta Standard Tag Library 1.2.7.
-OpenIDE-Module-Long-Description=Installs the Jakarta Standard Tag Library 1.2.7.
+OpenIDE-Module-Short-Description=Installs the Jakarta Standard Tag Library 1.2.7 and 3.0.2
+OpenIDE-Module-Long-Description=\
+    Installs the Jakarta Standard Tag Library 1.2.7 and 3.0.2
 
 # library display name
 jstl=JSTL 1.2.7
+jstl-jakarta=JSTL 3.0.2

enterprise/libs.jstl/src/org/netbeans/libs/jstl/jstl-jakarta.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<library version="3.0" xmlns="http://www.netbeans.org/ns/library-declaration/3">
+    <name>jstl-jakarta</name>
+    <type>j2se</type>
+    <localizing-bundle>org/netbeans/libs/jstl/Bundle</localizing-bundle>
+    <volume>
+        <type>classpath</type>
+        <resource>jar:nbinst://org.netbeans.libs.jstl/modules/ext/jstl-jakarta-impl.jar!/</resource>
+        <resource>jar:nbinst://org.netbeans.libs.jstl/modules/ext/jstl-jakarta-api.jar!/</resource>
+    </volume>
+    <volume>
+        <type>javadoc</type>
+        <resource>jar:nbinst://org.netbeans.modules.j2ee.platform/docs/javaee-doc-api.jar!/</resource>
+    </volume>
+    <properties>
+        <!-- please check with [email protected] before/after updating this or "classpath" section -->
+        <property>
+            <name>maven-dependencies</name>
+            <value>
+                jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.2:jar
+                org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.1:jar
+            </value>
+        </property>
+    </properties>
+</library>

enterprise/libs.jstl/src/org/netbeans/libs/jstl/layer.xml

@@ -29,6 +29,9 @@
       <file name="jstl.xml" url="jstl.xml">
         <attr name="displayName" bundlevalue="org/netbeans/libs/jstl/Bundle#jstl"/>
       </file>
+      <file name="jstl-jakarta.xml" url="jstl-jakarta.xml">
+        <attr name="displayName" bundlevalue="org/netbeans/libs/jstl/Bundle#jstl-jakarta"/>
+      </file>
     </folder>
   </folder>
 </filesystem>