Skip to content

Enable parsing of JSP 3.0 (Jakarta) based sources #8976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthiasblaesing merged 4 commits into from
Nov 12, 2025
Merged

Enable parsing of JSP 3.0 (Jakarta) based sources #8976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73ed79b
Fix NetBeans warnings
matthiasblaesing Oct 27, 2025
745ba7f
Package Jakarta based variant of JSTL
matthiasblaesing Nov 1, 2025
498dcc1
Enable parsing of JSP 3.0 (Jakarta) based sources
matthiasblaesing Nov 1, 2025
6b042fb
Run web.core and web.core.syntax unittests in CI/CD
matthiasblaesing Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion enterprise/libs.elimpl/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions enterprise/libs.jstl/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion enterprise/libs.jstl/external/jakarta.servlet.jsp.jstl-1.2-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion enterprise/libs.jstl/manifest.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

4 changes: 3 additions & 1 deletion enterprise/libs.jstl/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 5 additions & 3 deletions enterprise/libs.jstl/src/org/netbeans/libs/jstl/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
46 changes: 46 additions & 0 deletions enterprise/libs.jstl/src/org/netbeans/libs/jstl/jstl-jakarta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 mkleint@netbeans.org 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>
3 changes: 3 additions & 0 deletions enterprise/libs.jstl/src/org/netbeans/libs/jstl/layer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
237 changes: 163 additions & 74 deletions enterprise/servletjspapi/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,89 +26,178 @@
<condition property="servletjspapi.jarcreated" value="present">
<and>
<available file="external/generated-servlet-jsp-api-4.0_2.3.jar" />
<available file="external/generated-servlet-jsp-api-6.1_3.0.jar" />
</and>
</condition>
</target>

<target name="build-init" depends="-check-prepared-jar,projectized.build-init" unless="servletjspapi.jarcreated">
<property name="jars_location" location="./external"/>
<fail message="Set jars_location">
<condition>
<not>
<available file="${jars_location}" type="dir"/>
</not>
</condition>
</fail>
<property name="build_location" location="build/servletjspapi_api_location"/>
<property name="build_location_jakarta" location="build/servletjspapi_api_location_jakarta"/>

<echo message="Creating generated-servlet-jsp-api-4.0_2.3.jar"/>
<mkdir dir="servletjspapi_api_location"/>
<unzip src="${jars_location}/gf-client-module-5.1.0.jar" dest="servletjspapi_api_location/"/>
<unzip src="${jars_location}/jakarta.servlet-api-4.0.4.jar" dest="servletjspapi_api_location/"/>
<unzip src="${jars_location}/jakarta.servlet.jsp-api-2.3.6.jar" dest="servletjspapi_api_location/"/>
<unzip src="${jars_location}/jakarta.el-api-3.0.3.jar" dest="servletjspapi_api_location/"/>
<echo message="Creating generated-servlet-jsp-api-4.0_2.3.jar"/>
<mkdir dir="${build_location}"/>
<unzip src="${jars_location}/gf-client-module-7.0.25.jar" dest="${build_location}/"/>
<unzip src="${jars_location}/jakarta.servlet-api-4.0.4.jar" dest="${build_location}/"/>
<unzip src="${jars_location}/jakarta.servlet.jsp-api-2.3.6.jar" dest="${build_location}/"/>
<unzip src="${jars_location}/jakarta.el-api-3.0.3.jar" dest="${build_location}/"/>

<mkdir dir="servletjspapi_api_location/resources/dtds" />
<copy todir="servletjspapi_api_location/resources/dtds">
<fileset dir="./servletjspapi_api_location/dtds">
<include name="web-app_2_2.dtd"/>
<include name="web-app_2_3.dtd"/>
<include name="web-jsptaglibrary_1_1.dtd"/>
<include name="web-jsptaglibrary_1_2.dtd"/>
</fileset>
</copy>
<mkdir dir="${build_location}/resources/dtds" />
<copy todir="${build_location}/resources/dtds">
<fileset dir="${build_location}/dtds">
<include name="web-app_2_2.dtd"/>
<include name="web-app_2_3.dtd"/>
<include name="web-jsptaglibrary_1_1.dtd"/>
<include name="web-jsptaglibrary_1_2.dtd"/>
</fileset>
</copy>

<mkdir dir="servletjspapi_api_location/resources/schemas" />
<copy todir="servletjspapi_api_location/resources/schemas">
<fileset dir="servletjspapi_api_location/schemas">
<include name="XMLSchema.dtd"/>
<include name="datatypes.dtd"/>
<include name="j2ee_1_4.xsd"/>
<include name="j2ee_web_services_1_1.xsd"/>
<include name="j2ee_web_services_client_1_1.xsd"/>
<include name="javaee_5.xsd"/>
<include name="javaee_6.xsd"/>
<include name="javaee_7.xsd"/>
<include name="javaee_8.xsd"/>
<include name="javaee_web_services_1_2.xsd"/>
<include name="javaee_web_services_1_3.xsd"/>
<include name="javaee_web_services_1_4.xsd"/>
<include name="javaee_web_services_client_1_2.xsd"/>
<include name="javaee_web_services_client_1_3.xsd"/>
<include name="javaee_web_services_client_1_4.xsd"/>
<include name="jsp_2_0.xsd"/>
<include name="jsp_2_1.xsd"/>
<include name="jsp_2_2.xsd"/>
<include name="jsp_2_3.xsd"/>
<include name="web-app_2_4.xsd"/>
<include name="web-app_2_5.xsd"/>
<include name="web-app_3_0.xsd"/>
<include name="web-app_3_1.xsd"/>
<include name="web-app_4_0.xsd"/>
<include name="web-common_3_0.xsd"/>
<include name="web-common_3_1.xsd"/>
<include name="web-common_4_0.xsd"/>
<include name="web-facelettaglibrary_2_0.xsd"/>
<include name="web-facelettaglibrary_2_2.xsd"/>
<include name="web-facelettaglibrary_2_3.xsd"/>
<include name="web-fragment_3_0.xsd"/>
<include name="web-fragment_3_1.xsd"/>
<include name="web-fragment_4_0.xsd"/>
<include name="web-jsptaglibrary_2_0.xsd"/>
<include name="web-jsptaglibrary_2_1.xsd"/>
<include name="web-partialresponse_2_0.xsd"/>
<include name="web-partialresponse_2_2.xsd"/>
<include name="web-partialresponse_2_3.xsd"/>
<include name="xml.xsd"/>
<include name="beans_1_0.xsd"/>
<include name="beans_1_1.xsd"/>
<include name="beans_2_0.xsd"/>
</fileset>
</copy>
<mkdir dir="${build_location}/resources/schemas" />
<copy todir="${build_location}/resources/schemas">
<fileset dir="${build_location}/schemas">
<include name="XMLSchema.dtd"/>
<include name="datatypes.dtd"/>
<include name="j2ee_1_4.xsd"/>
<include name="j2ee_web_services_1_1.xsd"/>
<include name="j2ee_web_services_client_1_1.xsd"/>
<include name="javaee_5.xsd"/>
<include name="javaee_6.xsd"/>
<include name="javaee_7.xsd"/>
<include name="javaee_8.xsd"/>
<include name="javaee_web_services_1_2.xsd"/>
<include name="javaee_web_services_1_3.xsd"/>
<include name="javaee_web_services_1_4.xsd"/>
<include name="javaee_web_services_client_1_2.xsd"/>
<include name="javaee_web_services_client_1_3.xsd"/>
<include name="javaee_web_services_client_1_4.xsd"/>
<include name="jsp_2_0.xsd"/>
<include name="jsp_2_1.xsd"/>
<include name="jsp_2_2.xsd"/>
<include name="jsp_2_3.xsd"/>
<include name="web-app_2_4.xsd"/>
<include name="web-app_2_5.xsd"/>
<include name="web-app_3_0.xsd"/>
<include name="web-app_3_1.xsd"/>
<include name="web-app_4_0.xsd"/>
<include name="web-common_3_0.xsd"/>
<include name="web-common_3_1.xsd"/>
<include name="web-common_4_0.xsd"/>
<include name="web-facelettaglibrary_2_0.xsd"/>
<include name="web-facelettaglibrary_2_2.xsd"/>
<include name="web-facelettaglibrary_2_3.xsd"/>
<include name="web-fragment_3_0.xsd"/>
<include name="web-fragment_3_1.xsd"/>
<include name="web-fragment_4_0.xsd"/>
<include name="web-jsptaglibrary_2_0.xsd"/>
<include name="web-jsptaglibrary_2_1.xsd"/>
<include name="web-partialresponse_2_0.xsd"/>
<include name="web-partialresponse_2_2.xsd"/>
<include name="web-partialresponse_2_3.xsd"/>
<include name="xml.xsd"/>
<include name="beans_1_0.xsd"/>
<include name="beans_1_1.xsd"/>
<include name="beans_2_0.xsd"/>
</fileset>
</copy>

<delete file="./external/generated-servlet-jsp-api-4.0_2.3.jar" />
<zip basedir="servletjspapi_api_location"
includes="javax/servlet/jsp/**, javax/servlet/**, resources/**, javax/el/**"
zipfile="./external/generated-servlet-jsp-api-4.0_2.3.jar" />
<delete dir="servletjspapi_api_location" />
<delete file="./external/generated-servlet-jsp-api-4.0_2.3.jar" />
<zip basedir="${build_location}"
includes="javax/servlet/jsp/**, javax/servlet/**, resources/**, javax/el/**"
zipfile="./external/generated-servlet-jsp-api-4.0_2.3.jar" />
<delete dir="${build_location}" />


<echo message="Creating generated-servlet-jsp-api-6.1_3.0.jar"/>
<mkdir dir="${build_location_jakarta}"/>
<unzip src="${jars_location}/gf-client-module-7.0.25.jar" dest="${build_location_jakarta}/"/>
<unzip src="${jars_location}/jakarta.servlet-api-4.0.4.jar" dest="${build_location_jakarta}/"/>
<unzip src="${jars_location}/jakarta.servlet.jsp-api-2.3.6.jar" dest="${build_location_jakarta}/"/>
<unzip src="${jars_location}/jakarta.el-api-3.0.3.jar" dest="${build_location_jakarta}/"/>
<unzip src="${jars_location}/jakarta.servlet-api-6.1.0.jar" dest="${build_location_jakarta}/"/>
<unzip src="${jars_location}/jakarta.servlet.jsp-api-4.0.0.jar" dest="${build_location_jakarta}/"/>
<unzip src="${jars_location}/jakarta.el-api-6.0.1.jar" dest="${build_location_jakarta}/"/>

<mkdir dir="${build_location_jakarta}/resources/dtds" />
<copy todir="${build_location_jakarta}/resources/dtds">
<fileset dir="${build_location_jakarta}/dtds">
<include name="web-app_2_2.dtd"/>
<include name="web-app_2_3.dtd"/>
<include name="web-jsptaglibrary_1_1.dtd"/>
<include name="web-jsptaglibrary_1_2.dtd"/>
</fileset>
</copy>

<mkdir dir="${build_location_jakarta}/resources/schemas" />
<copy todir="${build_location_jakarta}/resources/schemas">
<fileset dir="${build_location_jakarta}/schemas">
<include name="XMLSchema.dtd"/>
<include name="datatypes.dtd"/>
<include name="j2ee_1_4.xsd"/>
<include name="j2ee_web_services_1_1.xsd"/>
<include name="j2ee_web_services_client_1_1.xsd"/>
<include name="javaee_5.xsd"/>
<include name="javaee_6.xsd"/>
<include name="javaee_7.xsd"/>
<include name="javaee_8.xsd"/>
<include name="jakartaee_10.xsd"/>
<include name="jakartaee_9.xsd"/>
<include name="javaee_web_services_1_2.xsd"/>
<include name="javaee_web_services_1_3.xsd"/>
<include name="javaee_web_services_1_4.xsd"/>
<include name="jakartaee_web_services_2_0.xsd"/>
<include name="javaee_web_services_client_1_2.xsd"/>
<include name="javaee_web_services_client_1_3.xsd"/>
<include name="javaee_web_services_client_1_4.xsd"/>
<include name="jakartaee_web_services_client_2_0.xsd"/>
<include name="jsp_2_0.xsd"/>
<include name="jsp_2_1.xsd"/>
<include name="jsp_2_2.xsd"/>
<include name="jsp_2_3.xsd"/>
<include name="jsp_3_0.xsd"/>
<include name="jsp_3_1.xsd"/>
<include name="web-app_2_4.xsd"/>
<include name="web-app_2_5.xsd"/>
<include name="web-app_3_0.xsd"/>
<include name="web-app_3_1.xsd"/>
<include name="web-app_4_0.xsd"/>
<include name="web-app_5_0.xsd"/>
<include name="web-app_6_0.xsd"/>
<include name="web-common_3_0.xsd"/>
<include name="web-common_3_1.xsd"/>
<include name="web-common_4_0.xsd"/>
<include name="web-common_5_0.xsd"/>
<include name="web-common_6_0.xsd"/>
<include name="web-facelettaglibrary_2_0.xsd"/>
<include name="web-facelettaglibrary_2_2.xsd"/>
<include name="web-facelettaglibrary_2_3.xsd"/>
<include name="web-facelettaglibrary_3_0.xsd"/>
<include name="web-fragment_3_0.xsd"/>
<include name="web-fragment_3_1.xsd"/>
<include name="web-fragment_4_0.xsd"/>
<include name="web-fragment_5_0.xsd"/>
<include name="web-fragment_6_0.xsd"/>
<include name="web-jsptaglibrary_2_0.xsd"/>
<include name="web-jsptaglibrary_2_1.xsd"/>
<include name="web-jsptaglibrary_3_0.xsd"/>
<include name="web-partialresponse_2_0.xsd"/>
<include name="web-partialresponse_2_2.xsd"/>
<include name="web-partialresponse_2_3.xsd"/>
<include name="web-partialresponse_3_0.xsd"/>
<include name="xml.xsd"/>
<include name="beans_1_0.xsd"/>
<include name="beans_1_1.xsd"/>
<include name="beans_2_0.xsd"/>
<include name="beans_3_0.xsd"/>
<include name="beans_4_0.xsd"/>
</fileset>
</copy>

<delete file="./external/generated-servlet-jsp-api-6.1_3.0.jar" />
<!-- jakarta/servlet/jsp/**, jakarta/servlet/**, jakarta/el/** -->
<zip basedir="${build_location_jakarta}"
includes="jakarta/servlet/jsp/**, jakarta/servlet/**, jakarta/el/**, resources/**"
zipfile="./external/generated-servlet-jsp-api-6.1_3.0.jar" />
<delete dir="${build_location_jakarta}" />
</target>
</project>
Loading
Loading