Merge pull request #25108 from arjantijms/8_0_update_mojarra_wasp

Integrate Mojarra 4.1.2 and WaSP-M2

appserver/distributions/glassfish/src/main/patches/jakarta.servlet.jsp.jstl-api/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Created-By: Apache Maven Bundle Plugin
 Build-Jdk-Spec: 11
-Bnd-LastModified: 1646360212099
+Bnd-LastModified: 1722961810017
 Bundle-Description: Jakarta Standard Tag Library 3.0 Specification
 Bundle-DocURL: https://www.eclipse.org
 Bundle-License: http://www.eclipse.org/legal/epl-2.0, https://www.gnu.or
@@ -10,22 +10,23 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Jakarta Standard Tag Library API
 Bundle-SymbolicName: jakarta.servlet.jsp.jstl-api
 Bundle-Vendor: Eclipse Foundation
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Export-Package: jakarta.servlet.jsp.jstl.core;uses:="jakarta.el,jakarta.
  servlet,jakarta.servlet.http,jakarta.servlet.jsp,jakarta.servlet.jsp.ta
- gext";version="3.0.0",jakarta.servlet.jsp.jstl.tlv;uses:="jakarta.servl
- et.jsp.tagext";version="3.0.0",jakarta.servlet.jsp.jstl.sql;version="3.
- 0.0",jakarta.servlet.jsp.jstl.fmt;uses:="jakarta.servlet.jsp";version="
- 3.0.0"
+ gext";version="3.0.1",jakarta.servlet.jsp.jstl.tlv;uses:="jakarta.servl
+ et.jsp.tagext";version="3.0.1",jakarta.servlet.jsp.jstl.sql;version="3.
+ 0.1",jakarta.servlet.jsp.jstl.fmt;uses:="jakarta.servlet.jsp";version="
+ 3.0.1"
 Extension-Name: jakarta.servlet.jsp.jstl
 Implementation-Vendor: Eclipse Foundation
 Implementation-Vendor-Id: org.glassfish
-Implementation-Version: 3.0.0
-Import-Package: jakarta.el;version="[5.0,7)",jakarta.servlet;version="[6
- .0,8)",jakarta.servlet.http;version="[6.0,8)",jakarta.servlet.jsp;versi
- on="[3.1,5)",jakarta.servlet.jsp.jstl.core,jakarta.servlet.jsp.tagext;v
+Implementation-Version: 3.0.1
+Import-Package: jakarta.el;version="[5.0,7)",jakarta.servlet.jsp;version
+ ="[3.1,5)",jakarta.servlet;version="[6.0,7)",jakarta.servlet.http;versi
+ on="[6.0,7)",jakarta.servlet.jsp.jstl.core,jakarta.servlet.jsp.tagext;v
  ersion="[3.1,5)",javax.xml.parsers,org.xml.sax,org.xml.sax.helpers
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=11))"
 Specification-Vendor: Eclipse Foundation
 Specification-Version: 3.0
-Tool: Bnd-5.1.1.202006162103
+Tool: Bnd-5.1.1.202006162103
+

appserver/pom.xml

@@ -82,7 +82,7 @@
 
         <!-- Jakarta Faces -->
         <jakarta.faces-api.version>4.1.0</jakarta.faces-api.version>
-        <mojarra.version>4.1.1</mojarra.version>
+        <mojarra.version>4.1.2</mojarra.version>
 
         <!-- Jakarta WebSocket -->
         <jakarta.websocket-api.version>2.2.0</jakarta.websocket-api.version>
@@ -139,8 +139,8 @@
 
         <!-- Jakarta Pages and Jakarta Standard Tag Library -->
         <jakarta.pages-api.version>4.0.0</jakarta.pages-api.version>
-        <jstl-api.version>3.0.0</jstl-api.version>
-        <wasp.version>4.0.0-M1</wasp.version>
+        <jstl-api.version>3.0.1</jstl-api.version>
+        <wasp.version>4.0.0-M2</wasp.version>
 
         <!-- Used for Jakarta SOAP (XML Web Services) -->
         <xmlsec.version>4.0.2</xmlsec.version>