diff --git a/demos/demo-jsp-webapp/pom.xml b/demos/demo-jsp-webapp/pom.xml
index 641ccccc905f..cd927121c266 100644
--- a/demos/demo-jsp-webapp/pom.xml
+++ b/demos/demo-jsp-webapp/pom.xml
@@ -62,6 +62,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+         <groupId>org.eclipse.jetty</groupId>
+         <artifactId>jetty-maven-plugin</artifactId>
+         <version>${project.version}</version>
+         <configuration>
+           <scan>1</scan>
+           <webApp>
+             <contextPath>/test</contextPath>
+             <tempDirectory>${project.build.directory}/work</tempDirectory>
+           </webApp>
+         </configuration>
+       </plugin>
     </plugins>
   </build>
 
diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc
index 9b681cf88971..a6e45fd74d4c 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc
@@ -700,32 +700,9 @@ For the JSTL library, we recommend the use of the implementation from Glassfish,
 |Jar |Bundle Symbolic Name
 |The link:#osgi-jsp[jsp jars]|
 
-|org.eclipse.jetty.orbit:jakarta.servlet.jsp.jstl-1.2.0.v201105211821.jar| jakarta.servlet.jsp.jstl
+|jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api-2.0.0.jar| jakarta.servlet.jsp.jstl-api
 
-|org.glassfish.web:jakarta.servlet.jsp.jstl-1.2.2.jar|org.glassfish.web.jakarta.servlet.jsp.jstl
-|=======================================================================
-
-However, if you wish, you may use the JSTL implementation from Apache instead, although you will need to source some dependency jars with suitable OSGi manifests:
-
-.Jars Required for Apache JSTL
-[cols=",,",options="header",]
-|=======================================================================
-|Jar |Bundle Symbolic Name |Location
-|The link:#osgi-jsp[jsp jars] | |
-
-|org.apache.taglibs:taglibs-standard-spec:jar:1.2.1
-|org.apache.taglibs.taglibs-standard-spec |Distribution lib/apache-jstl
-
-|org.apache.taglibs:taglibs-standard-spec:jar:1.2.1
-|org.apache.taglibs.standard-impl |Distribution lib/apache-jstl
-
-|org.apache.xalan 2.7.1 | |Try
-http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/plugins/org.apache.xalan_2.7.1.v201005080400.jar[Eclipse
-Orbit]
-
-|org.apache.xml.serializer 2.7.1 | |Try
-http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/plugins/org.apache.xml.serializer_2.7.1.v201005080400.jar[Eclipse
-Orbit]
+|org.glassfish.web:jakarta.servlet.jsp.jstl-2.0.0.jar|org.glassfish.web.jakarta.servlet.jsp.jstl
 |=======================================================================
 
 ===== The jetty-osgi-boot-jsp jar
diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/jsp/configuring-jsp.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/jsp/configuring-jsp.adoc
index 80cb0d3b0789..de1fa5d83614 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/jsp/configuring-jsp.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/jsp/configuring-jsp.adoc
@@ -279,9 +279,9 @@ It is also automatically on the classpath for the Jetty Maven plugin, which uses
 If you are using Jetty in an embedded scenario, and you need to use JSTL, then you must ensure that the JSTL jars are included on the _container's_ classpath - that is the classpath that is the _parent_ of the webapp's classpath.
 This is a restriction that arises from the JavaEE specification.
 
-====== Apache JSP
+====== Glassfish JSTL
 
-You will need to put the jars that are present in the `{$jetty.home}/lib/apache-jstl` directory onto the _container's_ classpath.
+You will need to put the jars that are present in the `{$jetty.home}/lib/glassfish-jstl` directory onto the _container's_ classpath.
 The Apache JSP engine will find the JSTL tag definitions inside these jars during startup.
 
 As an efficiency enhancement, you can have jetty examine the JSTL jars to find the tags, and pre-feed them into the Apache JSP engine.
diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-list-modules.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-list-modules.adoc
index 239bcb95d1a3..cedaa695c1ea 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-list-modules.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-list-modules.adoc
@@ -46,10 +46,10 @@ Modules for tag '*':
         LIB: lib/apache-jsp/*.jar
     Enabled: transitive provider of apache-jsp for jsp
 
-     Module: apache-jstl
-           : Enables the apache version of JSTL
-        LIB: lib/apache-jstl/*.jar
-    Enabled: transitive provider of apache-jstl for jstl
+     Module: glassfish-jstl
+           : Enables the Glassfish version of JSTL
+        LIB: lib/glassfish-jstl/*.jar
+    Enabled: transitive provider of glassfish-jstl for jstl
 
      Module: cdi2
            : Jetty setup to support Weld/CDI2 with WELD inside the webapp
@@ -145,7 +145,7 @@ Modules for tag '*':
 
      Module: jstl
            : Enables JSTL for all webapplications deployed on the server
-     Depend: jsp, apache-jstl
+     Depend: jsp, glassfish-jstl
     Enabled: ${jetty.base}\start.d\jstl.ini
 
      Module: jvm
diff --git a/apache-jstl/pom.xml b/glassfish-jstl/pom.xml
similarity index 87%
rename from apache-jstl/pom.xml
rename to glassfish-jstl/pom.xml
index 6add837dcb8c..b3846c99b859 100644
--- a/apache-jstl/pom.xml
+++ b/glassfish-jstl/pom.xml
@@ -5,12 +5,12 @@
     <version>11.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>apache-jstl</artifactId>
-  <name>Apache :: JSTL module</name>
-  <url>http://tomcat.apache.org/taglibs/standard/</url>
+  <artifactId>glassfish-jstl</artifactId>
+  <name>Glassfish :: JSTL module</name>
+  <url>https://projects.eclipse.org/projects/ee4j.glassfish</url>
   <packaging>jar</packaging>
   <properties>
-    <bundle-symbolic-name>${project.groupId}.apache.jstl</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.groupId}.glassfish.jstl</bundle-symbolic-name>
   </properties>
 
   <build>
@@ -49,10 +49,9 @@
       </exclusions>
     </dependency>
 
-
     <dependency>
-      <groupId>org.mortbay.jasper</groupId>
-      <artifactId>taglibs-standard</artifactId>
+      <groupId>org.glassfish.web</groupId>
+      <artifactId>jakarta.servlet.jsp.jstl</artifactId>
     </dependency>
 
     <dependency>
diff --git a/apache-jstl/src/main/config/modules/apache-jstl.mod b/glassfish-jstl/src/main/config/modules/glassfish-jstl.mod
similarity index 59%
rename from apache-jstl/src/main/config/modules/apache-jstl.mod
rename to glassfish-jstl/src/main/config/modules/glassfish-jstl.mod
index de94202bebe1..1b6a0b01562e 100644
--- a/apache-jstl/src/main/config/modules/apache-jstl.mod
+++ b/glassfish-jstl/src/main/config/modules/glassfish-jstl.mod
@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables the apache version of JSTL for all webapps.
+Enables the glassfish version of JSTL for all webapps.
 
 [lib]
-lib/apache-jstl/*.jar
+lib/glassfish-jstl/*.jar
diff --git a/apache-jstl/src/main/resources/readme.txt b/glassfish-jstl/src/main/resources/readme.txt
similarity index 100%
rename from apache-jstl/src/main/resources/readme.txt
rename to glassfish-jstl/src/main/resources/readme.txt
diff --git a/apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java b/glassfish-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java
similarity index 100%
rename from apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java
rename to glassfish-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java
diff --git a/apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspIncludeTest.java b/glassfish-jstl/src/test/java/org/eclipse/jetty/jstl/JspIncludeTest.java
similarity index 100%
rename from apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspIncludeTest.java
rename to glassfish-jstl/src/test/java/org/eclipse/jetty/jstl/JspIncludeTest.java
diff --git a/apache-jstl/src/test/java/org/eclipse/jetty/jstl/JstlTest.java b/glassfish-jstl/src/test/java/org/eclipse/jetty/jstl/JstlTest.java
similarity index 100%
rename from apache-jstl/src/test/java/org/eclipse/jetty/jstl/JstlTest.java
rename to glassfish-jstl/src/test/java/org/eclipse/jetty/jstl/JstlTest.java
diff --git a/apache-jstl/src/test/resources/jetty-logging.properties b/glassfish-jstl/src/test/resources/jetty-logging.properties
similarity index 100%
rename from apache-jstl/src/test/resources/jetty-logging.properties
rename to glassfish-jstl/src/test/resources/jetty-logging.properties
diff --git a/apache-jstl/src/test/taglibjar/META-INF/etag.tld b/glassfish-jstl/src/test/taglibjar/META-INF/etag.tld
similarity index 100%
rename from apache-jstl/src/test/taglibjar/META-INF/etag.tld
rename to glassfish-jstl/src/test/taglibjar/META-INF/etag.tld
diff --git a/apache-jstl/src/test/taglibjar/META-INF/tags/errorhandler.tag b/glassfish-jstl/src/test/taglibjar/META-INF/tags/errorhandler.tag
similarity index 100%
rename from apache-jstl/src/test/taglibjar/META-INF/tags/errorhandler.tag
rename to glassfish-jstl/src/test/taglibjar/META-INF/tags/errorhandler.tag
diff --git a/apache-jstl/src/test/webapp/WEB-INF/web.xml b/glassfish-jstl/src/test/webapp/WEB-INF/web.xml
similarity index 100%
rename from apache-jstl/src/test/webapp/WEB-INF/web.xml
rename to glassfish-jstl/src/test/webapp/WEB-INF/web.xml
diff --git a/apache-jstl/src/test/webapp/catch-basic.jsp b/glassfish-jstl/src/test/webapp/catch-basic.jsp
similarity index 100%
rename from apache-jstl/src/test/webapp/catch-basic.jsp
rename to glassfish-jstl/src/test/webapp/catch-basic.jsp
diff --git a/apache-jstl/src/test/webapp/catch-taglib.jsp b/glassfish-jstl/src/test/webapp/catch-taglib.jsp
similarity index 100%
rename from apache-jstl/src/test/webapp/catch-taglib.jsp
rename to glassfish-jstl/src/test/webapp/catch-taglib.jsp
diff --git a/apache-jstl/src/test/webapp/included.jsp b/glassfish-jstl/src/test/webapp/included.jsp
similarity index 100%
rename from apache-jstl/src/test/webapp/included.jsp
rename to glassfish-jstl/src/test/webapp/included.jsp
diff --git a/apache-jstl/src/test/webapp/ref.jsp b/glassfish-jstl/src/test/webapp/ref.jsp
similarity index 100%
rename from apache-jstl/src/test/webapp/ref.jsp
rename to glassfish-jstl/src/test/webapp/ref.jsp
diff --git a/apache-jstl/src/test/webapp/top.jsp b/glassfish-jstl/src/test/webapp/top.jsp
similarity index 100%
rename from apache-jstl/src/test/webapp/top.jsp
rename to glassfish-jstl/src/test/webapp/top.jsp
diff --git a/apache-jstl/src/test/webapp/urls.jsp b/glassfish-jstl/src/test/webapp/urls.jsp
similarity index 100%
rename from apache-jstl/src/test/webapp/urls.jsp
rename to glassfish-jstl/src/test/webapp/urls.jsp
diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
index 3dc7eabdb795..6aff212cb175 100644
--- a/jetty-deploy/src/main/config/etc/jetty-deploy.xml
+++ b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
@@ -18,7 +18,7 @@
         </Set>
         <Call name="setContextAttribute">
           <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-          <Arg>.*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*/jakarta.servlet.jsp.jstl-.*\.jar$|.*/.*taglibs-standard-.*\.jar$</Arg>
+          <Arg>.*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*/.*jakarta.servlet.jsp.jstl-.*\.jar$</Arg>
         </Call>
 
         <!-- Add a customize step to the deployment lifecycle -->
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index 51536fa3eb95..04289bdd9780 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -127,7 +127,7 @@
                 org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
               </excludeGroupIds>
               <excludeArtifactIds>
-                apache-jsp,apache-jstl,jetty-start,jetty-slf4j-impl
+                apache-jsp,glassfish-jstl,jetty-start,jetty-slf4j-impl
               </excludeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib</outputDirectory>
@@ -145,7 +145,7 @@
                 org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
               </excludeGroupIds>
               <excludeArtifactIds>
-                apache-jsp,apache-jstl,jetty-start
+                apache-jsp,glassfish-jstl,jetty-start
               </excludeArtifactIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
@@ -376,32 +376,30 @@
             </configuration>
           </execution>
           <execution>
-            <id>copy-apache-jstl-deps</id>
+            <id>copy-glassfish-jstl-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <excludeGroupIds>org.glassfish.web</excludeGroupIds>
-              <includeArtifactIds>jakarta.servlet.jsp.jstl-api,taglibs-standard</includeArtifactIds>
+              <includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
               <prependGroupId>true</prependGroupId>
               <includeTypes>jar</includeTypes>
-              <outputDirectory>${assembly-directory}/lib/apache-jstl</outputDirectory>
+              <outputDirectory>${assembly-directory}/lib/glassfish-jstl</outputDirectory>
             </configuration>
           </execution>
           <execution>
-            <id>copy-apache-jstl-src-deps</id>
+            <id>copy-glassfish-jstl-src-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <excludeGroupIds>org.glassfish.web</excludeGroupIds>
-              <includeArtifactIds>jakarta.servlet.jsp.jstl-api,taglibs-standard</includeArtifactIds>
+              <includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
               <prependGroupId>true</prependGroupId>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
-              <outputDirectory>${source-assembly-directory}/lib/apache-jstl</outputDirectory>
+              <outputDirectory>${source-assembly-directory}/lib/glassfish-jstl</outputDirectory>
             </configuration>
           </execution>
           <execution>
@@ -630,7 +628,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>apache-jstl</artifactId>
+      <artifactId>glassfish-jstl</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-home/src/main/resources/modules/jstl.mod b/jetty-home/src/main/resources/modules/jstl.mod
index 32ab7cf3275e..2b5c2fa76699 100644
--- a/jetty-home/src/main/resources/modules/jstl.mod
+++ b/jetty-home/src/main/resources/modules/jstl.mod
@@ -5,5 +5,5 @@ Enables JSTL for all web applications deployed on the server.
 
 [depend]
 jsp
-apache-jstl
+glassfish-jstl
 
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index 24612c1e52aa..3d26635d564f 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -107,29 +107,29 @@
               org.apache.jasper.tagplugins.jstl;version="[$(version;==;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
               org.apache.jasper.util;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
               org.apache.jasper.xmlparser;version="[$(version;==;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
-              org.apache.taglibs.standard;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.extra.spath;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.functions;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.lang.jstl;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.lang.jstl.parser;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.lang.jstl.test;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.lang.jstl.test.beans;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.lang.support;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.resources;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.common.core;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.common.fmt;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.common.sql;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.common.xml;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.el.core;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.el.fmt;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.el.sql;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.el.xml;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.rt.core;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.rt.fmt;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.rt.sql;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tag.rt.xml;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tei;version="1.2";resolution:=optional,
-              org.apache.taglibs.standard.tlv;version="1.2";resolution:=optional,
+              org.apache.taglibs.standard;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.extra.spath;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.functions;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.lang.jstl;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.lang.jstl.parser;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.lang.jstl.test;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.lang.jstl.test.beans;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.lang.support;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.resources;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.common.core;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.common.fmt;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.common.sql;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.common.xml;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.el.core;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.el.fmt;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.el.sql;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.el.xml;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.rt.core;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.rt.fmt;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.rt.sql;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tag.rt.xml;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tei;version="2.0";resolution:=optional,
+              org.apache.taglibs.standard.tlv;version="2.0";resolution:=optional,
               org.apache.tomcat;version="[10,11)";resolution:=optional,
               org.eclipse.jetty.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional,
               org.slf4j.*,
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 5bd95f3fa62c..25de312a1c93 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -238,35 +238,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jasper</groupId>
-      <artifactId>taglibs-standard</artifactId>
-   </dependency>
-   <dependency>
-    <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.xalan</artifactId>
-      <version>2.7.2_3</version>
-   </dependency>
-   <dependency>
-    <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.xalan-serializer</artifactId>
-      <version>2.7.2_1</version>
-   </dependency>
-   <dependency>
-    <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
-      <version>5.2_4</version>
+      <groupId>org.glassfish.web</groupId>
+      <artifactId>jakarta.servlet.jsp.jstl</artifactId>
    </dependency>
-   <dependency>
-    <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
-      <version>1.2_5</version>
-   </dependency>
-   <dependency>
-    <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
-      <version>2.12.0_1</version>
-   </dependency>
-
     <!-- Jetty Deps -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
index f903c03cd1d0..3ef462bd502d 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
@@ -211,12 +211,7 @@ public static List<Option> jspDependencies()
         res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("apache-jsp").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("apache-jsp").versionAsInProject().start());
         res.add(mavenBundle().groupId("jakarta.servlet.jsp.jstl").artifactId("jakarta.servlet.jsp.jstl-api").versionAsInProject());
-        res.add(mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.xmlresolver").version("1.2_5").start());
-        res.add(mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.xerces").version("2.12.0_1").start());
-        res.add(mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.xalan-serializer").version("2.7.2_1").start());
-        res.add(mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.bcel").version("5.2_4").start());
-        res.add(mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.xalan").version("2.7.2_3").start());
-        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("taglibs-standard").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.glassfish.web").artifactId("jakarta.servlet.jsp.jstl").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jdt").artifactId("ecj").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("jetty-osgi-boot-jsp").versionAsInProject().noStart());
         return res;
diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index e4c2e8baa44f..788060639e9d 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -137,7 +137,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>apache-jstl</artifactId>
+      <artifactId>glassfish-jstl</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 4704086d32e1..0fa2ec0b1e60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,8 @@
     <servlet.api.version>5.0.2</servlet.api.version>
     <!-- change version in jetty-websocket/websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod -->
     <websocket.api.version>2.0.0</websocket.api.version>
-    <jsp.version>10.0.0-M10</jsp.version>
+    <jsp.version>10.0.0-SNAPSHOT</jsp.version>
+    <jstl.version>2.0.0</jstl.version>
     <jsp.api.version>3.0</jsp.api.version>
     <annotation-api.version>2.0.0</annotation-api.version>
     <transaction-api.version>2.0.0</transaction-api.version>
@@ -120,7 +121,7 @@
     <module>jetty-servlets</module>
     <module>jetty-util-ajax</module>
     <module>apache-jsp</module>
-    <module>apache-jstl</module>
+    <module>glassfish-jstl</module>
     <module>jetty-maven-plugin</module>
     <module>jetty-jspc-maven-plugin</module>
     <module>jetty-deploy</module>
@@ -1066,9 +1067,9 @@
         <version>${jsp.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.mortbay.jasper</groupId>
-        <artifactId>taglibs-standard</artifactId>
-        <version>${jsp.version}</version>
+        <groupId>org.glassfish.web</groupId>
+        <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+        <version>${jstl.version}</version>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jasper</groupId>
diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml
index fbcc049e2d6b..c902c1290ab6 100644
--- a/tests/test-quickstart/pom.xml
+++ b/tests/test-quickstart/pom.xml
@@ -103,7 +103,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>apache-jstl</artifactId>
+      <artifactId>glassfish-jstl</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>