[tomcat] branch main updated: Update EL version for 10.1.x to EL 5.0 - there will be API changes

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 098c280  Update EL version for 10.1.x to EL 5.0 - there will be API 
changes
098c280 is described below

commit 098c280cb2186d9bef351a36d238efbc89a37bd0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 25 11:57:58 2021 +0100

    Update EL version for 10.1.x to EL 5.0 - there will be API changes
---
 RELEASE-NOTES                       |  2 +-
 build.xml                           |  2 +-
 webapps/docs/changelog.xml          | 10 ++++++++--
 webapps/docs/class-loader-howto.xml |  2 +-
 webapps/docs/project.xml            |  2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b90c48b..7bd6f7c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -74,7 +74,7 @@ for use by web applications (by placing them in "lib"):
 * catalina-storeconfig.jar (Generation of XML configuration from current state)
 * catalina-tribes.jar (Group communication)
 * ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler)
-* el-api.jar (EL 4.0 API)
+* el-api.jar (EL 5.0 API)
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
 * jsp-api.jar (JSP 3.0 API)
diff --git a/build.xml b/build.xml
index f244afa..2a41f76 100644
--- a/build.xml
+++ b/build.xml
@@ -56,7 +56,7 @@
   <property name="servlet.revision"        value="0" />
   <property name="jsp.spec.version"        value="3.0" />
   <property name="jsp.revision"            value="0" />
-  <property name="el.spec.version"         value="4.0" />
+  <property name="el.spec.version"         value="5.0" />
   <property name="el.revision"             value="0" />
   <property name="websocket.spec.version"  value="2.0" />
   <property name="websocket.revision"      value="0" />
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9c11ad4..8ac487a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,8 +119,9 @@
   <subsection name="Catalina">
     <changelog>
       <scode>
-        Incremented supported Servlet version to 5.1 to align with the current
-        development branch of the Servlet specification. (markt)
+        Incremented tje supported Jakarta Servlet version to 5.1 to align with
+        the current development branch of the Jakarta Servlet specification.
+        (markt)
       </scode>
       <fix>
         <bug>65301</bug>: <code>RemoteIpValve</code> will now avoid getting
@@ -169,6 +170,11 @@
   <subsection name="Jasper">
     <changelog>
       <scode>
+        Incremented the supported Jakarta Expression Language version to 5.0 to
+        align with the current development branch of the Jakarta Expression
+        Language specification. (markt)
+      </scode>
+      <scode>
         Review code used to generate Java source from JSPs and tags and remove
         code found to be unnecessary. (markt)
       </scode>
diff --git a/webapps/docs/class-loader-howto.xml 
b/webapps/docs/class-loader-howto.xml
index a566f3f..a85ead7 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -140,7 +140,7 @@ loaders as it is initialized:</p>
         configuration files from current state</li>
     <li><em>catalina-tribes.jar</em> &#8212; Group communication package.</li>
     <li><em>ecj-*.jar</em> &#8212; Eclipse JDT Java compiler.</li>
-    <li><em>el-api.jar</em> &#8212; EL 4.0 API.</li>
+    <li><em>el-api.jar</em> &#8212; EL 5.0 API.</li>
     <li><em>jasper.jar</em> &#8212; Tomcat Jasper JSP Compiler and 
Runtime.</li>
     <li><em>jasper-el.jar</em> &#8212; Tomcat Jasper EL implementation.</li>
     <li><em>jsp-api.jar</em> &#8212; JSP 3.0 API.</li>
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index e4cf153..d241683 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -85,7 +85,7 @@
         <item name="Tomcat Javadocs"       href="api/index.html"/>
         <item name="Servlet 5.1 Javadocs"  href="servletapi/index.html"/>
         <item name="JSP 3.0 Javadocs"      href="jspapi/index.html"/>
-        <item name="EL 4.0 Javadocs"       href="elapi/index.html"/>
+        <item name="EL 5.0 Javadocs"       href="elapi/index.html"/>
         <item name="WebSocket 2.0 Javadocs"
               href="websocketapi/index.html"/>
         <item name="JASPIC 2.0 Javadocs"   href="jaspicapi/index.html"/>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org