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
commit 9f4c1779aedbb916046118c495e2c904869bc959
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Oct 19 13:40:17 2022 +0100
Next EL release will be 6.0
---
RELEASE-NOTES | 2 +-
build.xml | 4 ++--
webapps/docs/class-loader-howto.xml | 2 +-
webapps/docs/index.xml | 6 +++---
webapps/docs/project.xml | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c9233daa55..74ce5f0742 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 5.0 API)
+* el-api.jar (EL 6.0 API)
* jasper.jar (Jasper 2 Compiler and Runtime)
* jasper-el.jar (Jasper 2 EL implementation)
* jsp-api.jar (JSP 4.0 API)
diff --git a/build.xml b/build.xml
index d2dda8f60d..ba3757240d 100644
--- a/build.xml
+++ b/build.xml
@@ -61,8 +61,8 @@
<property name="servlet.revision" value="" />
<property name="jsp.spec.version" value="4.0" />
<property name="jsp.revision" value="-SNAPSHOT" />
- <property name="el.spec.version" value="5.0" />
- <property name="el.revision" value="" />
+ <property name="el.spec.version" value="6.0" />
+ <property name="el.revision" value="-SNAPSHOT" />
<property name="websocket.spec.version" value="2.1" />
<property name="websocket.revision" value="" />
<property name="jaspic.spec.version" value="3.0" />
diff --git a/webapps/docs/class-loader-howto.xml
b/webapps/docs/class-loader-howto.xml
index b2fc5b3c6c..2d26404aed 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> — Group communication package.</li>
<li><em>ecj-*.jar</em> — Eclipse JDT Java compiler.</li>
- <li><em>el-api.jar</em> — EL 5.0 API.</li>
+ <li><em>el-api.jar</em> — EL 6.0 API.</li>
<li><em>jasper.jar</em> — Tomcat Jasper JSP Compiler and
Runtime.</li>
<li><em>jasper-el.jar</em> — Tomcat Jasper EL implementation.</li>
<li><em>jsp-api.jar</em> — JSP 4.0 API.</li>
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index 5febb64ab6..9d2119e60c 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -176,10 +176,10 @@ are responsible for installing, configuring, and
operating an Apache Tomcat serv
<a href="https://jakarta.ee/specifications/pages/4.0/apidocs";>
<strong>Javadoc</strong></a>
</li>
-<li>EL 5.0
- <a href="https://jakarta.ee/specifications/expression-language/5.0/";>
+<li>EL 6.0
+ <a href="https://jakarta.ee/specifications/expression-language/6.0/";>
<strong>Specification</strong></a> and
- <a
href="https://jakarta.ee/specifications/expression-language/5.0/apidocs";>
+ <a
href="https://jakarta.ee/specifications/expression-language/6.0/apidocs";>
<strong>Javadoc</strong></a>
</li>
<li>WebSocket 2.1
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index a538430590..06d913d392 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 6.0 Javadocs" href="servletapi/index.html"/>
<item name="JSP 4.0 Javadocs" href="jspapi/index.html"/>
- <item name="EL 5.0 Javadocs" href="elapi/index.html"/>
+ <item name="EL 6.0 Javadocs" href="elapi/index.html"/>
<item name="WebSocket 2.1 Javadocs"
href="websocketapi/index.html"/>
<item name="Authentication 3.0 Javadocs"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
