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 1ed8c3e8f70009a5700a416da88c4c81575eda14
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Oct 19 11:47:02 2022 +0100
Next JSP version will be 4.0
Still need updated schema
---
RELEASE-NOTES | 2 +-
build.xml | 4 ++--
java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
java/org/apache/jasper/Constants.java | 2 +-
java/org/apache/jasper/compiler/Generator.java | 2 +-
java/org/apache/jasper/compiler/Validator.java | 2 +-
java/org/apache/jasper/resources/LocalStrings.properties | 2 +-
webapps/docs/appdev/deployment.xml | 2 +-
webapps/docs/appdev/introduction.xml | 4 ++--
webapps/docs/class-loader-howto.xml | 2 +-
webapps/docs/index.xml | 8 ++++----
webapps/docs/project.xml | 2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3d648e79bc..c9233daa55 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -77,7 +77,7 @@ for use by web applications (by placing them in "lib"):
* 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.1 API)
+* jsp-api.jar (JSP 4.0 API)
* servlet-api.jar (Servlet 6.0 API)
* tomcat-api.jar (Interfaces shared by Catalina and Jasper)
* tomcat-coyote.jar (Tomcat connectors and utility classes)
diff --git a/build.xml b/build.xml
index e49889674e..d2dda8f60d 100644
--- a/build.xml
+++ b/build.xml
@@ -59,8 +59,8 @@
<!-- Exact spec versions (for the manifests etc.) -->
<property name="servlet.spec.version" value="6.0" />
<property name="servlet.revision" value="" />
- <property name="jsp.spec.version" value="3.1" />
- <property name="jsp.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="websocket.spec.version" value="2.1" />
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 79cff350f0..2d421430fd 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -68,7 +68,7 @@ public class CoyoteAdapter implements Adapter {
// -------------------------------------------------------------- Constants
- private static final String POWERED_BY = "Servlet/6.0 JSP/3.1 " +
+ private static final String POWERED_BY = "Servlet/6.0 JSP/4.0 " +
"(" + ServerInfo.getServerInfo() + " Java/" +
System.getProperty("java.vm.vendor") + "/" +
System.getProperty("java.runtime.version") + ")";
diff --git a/java/org/apache/jasper/Constants.java
b/java/org/apache/jasper/Constants.java
index ec17ceadb3..7a5f736e8c 100644
--- a/java/org/apache/jasper/Constants.java
+++ b/java/org/apache/jasper/Constants.java
@@ -30,7 +30,7 @@ import java.util.List;
*/
public class Constants {
- public static final String SPEC_VERSION = "3.1";
+ public static final String SPEC_VERSION = "4.0";
/**
* These classes/packages are automatically imported by the
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 41c8feb67a..af6f9fc1af 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -833,7 +833,7 @@ class Generator {
out.println(");");
if (ctxt.getOptions().isXpoweredBy()) {
- out.printil("response.addHeader(\"X-Powered-By\", \"JSP/3.1\");");
+ out.printil("response.addHeader(\"X-Powered-By\", \"JSP/4.0\");");
}
out.printil("pageContext = _jspxFactory.getPageContext(this, request,
response,");
diff --git a/java/org/apache/jasper/compiler/Validator.java
b/java/org/apache/jasper/compiler/Validator.java
index fea0b38660..8bf352e97e 100644
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -551,7 +551,7 @@ class Validator {
if (!version.equals("1.2") && !version.equals("2.0") &&
!version.equals("2.1") && !version.equals("2.2") &&
!version.equals("2.3") && !version.equals("3.0") &&
- !version.equals("3.1")) {
+ !version.equals("3.1") && !version.equals("4.0")) {
err.jspError(n, "jsp.error.jsproot.version.invalid", version);
}
visitBody(n);
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 35c192f240..eda546595f 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -107,7 +107,7 @@ jsp.error.jspoutput.doctypenamesystem=<jsp:output>:
'doctype-root-element'
jsp.error.jspoutput.doctypepublicsystem=<jsp:output>: 'doctype-system'
attribute must appear if 'doctype-public' attribute appears
jsp.error.jspoutput.invalidUse=<jsp:output> must not be used in standard
syntax
jsp.error.jspoutput.nonemptybody=<jsp:output> must not have a body
-jsp.error.jsproot.version.invalid=Invalid version number: [{0}], must be
"1.2", "2.0", "2.1", "2.2", "2.3", "3.0" or "3.1"
+jsp.error.jsproot.version.invalid=Invalid version number: [{0}], must be
"1.2", "2.0", "2.1", "2.2", "2.3", "3.0", "3.1" or "4.0"
jsp.error.jsptext.badcontent='<', when appears in the body of
<jsp:text>, must be encapsulated within a CDATA
jsp.error.lastModified=Unable to determine last modified date for file [{0}]
jsp.error.library.invalid=JSP page is invalid according to library [{0}]: [{1}]
diff --git a/webapps/docs/appdev/deployment.xml
b/webapps/docs/appdev/deployment.xml
index 62aaa9832d..b3685f0765 100644
--- a/webapps/docs/appdev/deployment.xml
+++ b/webapps/docs/appdev/deployment.xml
@@ -136,7 +136,7 @@ drivers that are required for both your application or
internal Tomcat use
<p>Out of the box, a standard Tomcat installation includes a variety
of pre-installed shared library files, including:</p>
<ul>
-<li>The <em>Servlet 6.0</em> and <em>JSP 3.1</em> APIs that are fundamental
+<li>The <em>Servlet 6.0</em> and <em>JSP 4.0</em> APIs that are fundamental
to writing servlets and JSPs.<br/><br/></li>
</ul>
diff --git a/webapps/docs/appdev/introduction.xml
b/webapps/docs/appdev/introduction.xml
index 74e4fe0e85..ee856d1fbe 100644
--- a/webapps/docs/appdev/introduction.xml
+++ b/webapps/docs/appdev/introduction.xml
@@ -62,8 +62,8 @@ the details of your particular environment.</p>
information, documentation, and software that is useful in developing
web applications with Tomcat.</p>
<ul>
-<li><p><a
href="https://jakarta.ee/specifications/pages/3.1/";>https://jakarta.ee/specifications/pages/3.1/</a>
-
- <i>Jakarta Server Pages (JSP), Version 3.1</i>. Describes
+<li><p><a
href="https://jakarta.ee/specifications/pages/4.0/";>https://jakarta.ee/specifications/pages/4.0/</a>
-
+ <i>Jakarta Server Pages (JSP), Version 4.0</i>. Describes
the programming environment provided by standard implementations
of the Jakarta Server Pages technology. In conjunction with
the Servlet API Specification (see below), this document describes
diff --git a/webapps/docs/class-loader-howto.xml
b/webapps/docs/class-loader-howto.xml
index 814c0f9bc1..b2fc5b3c6c 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -143,7 +143,7 @@ loaders as it is initialized:</p>
<li><em>el-api.jar</em> — EL 5.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 3.1 API.</li>
+ <li><em>jsp-api.jar</em> — JSP 4.0 API.</li>
<li><em>servlet-api.jar</em> — Servlet 6.0 API.</li>
<li><em>tomcat-api.jar</em> — Several interfaces defined by
Tomcat.</li>
<li><em>tomcat-coyote.jar</em> — Tomcat connectors and utility
classes.</li>
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index 835097d5e6..5febb64ab6 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -35,7 +35,7 @@
<p>This is the top-level entry point of the documentation bundle for the
<strong>Apache Tomcat</strong> Servlet/JSP container. Apache Tomcat version
-<version-major-minor/> implements the Servlet 6.0 and JavaServer Pages 3.1
+<version-major-minor/> implements the Servlet 6.0 and JavaServer Pages 4.0
<a
href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>specifications</a>
from
<a href="https://jakarta.ee/";>Jakarta EE</a>, and includes many
additional features that make it a useful platform for developing and deploying
@@ -170,10 +170,10 @@ are responsible for installing, configuring, and
operating an Apache Tomcat serv
<a href="https://jakarta.ee/specifications/servlet/6.0/apidocs";>
<strong>Javadoc</strong></a>
</li>
-<li>JSP 3.1
- <a href="https://jakarta.ee/specifications/pages/3.1/";>
+<li>JSP 4.0
+ <a href="https://jakarta.ee/specifications/pages/4.0/";>
<strong>Specification</strong></a> and
- <a href="https://jakarta.ee/specifications/pages/3.1/apidocs";>
+ <a href="https://jakarta.ee/specifications/pages/4.0/apidocs";>
<strong>Javadoc</strong></a>
</li>
<li>EL 5.0
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index 42ea6a24df..a538430590 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -84,7 +84,7 @@
<item name="Configuration" href="config/index.html"/>
<item name="Tomcat Javadocs" href="api/index.html"/>
<item name="Servlet 6.0 Javadocs" href="servletapi/index.html"/>
- <item name="JSP 3.1 Javadocs" href="jspapi/index.html"/>
+ <item name="JSP 4.0 Javadocs" href="jspapi/index.html"/>
<item name="EL 5.0 Javadocs" href="elapi/index.html"/>
<item name="WebSocket 2.1 Javadocs"
href="websocketapi/index.html"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
