First pass at updating Jakarta Server Pages version

jakartaee · Feb 23, 2022 · ecfda94 · ecfda94
1 parent ecb9cc6
commit ecfda94
Show file tree

Hide file tree

Showing 13 changed files with 87 additions and 67 deletions.
diff --git a/...s/JakartaServerPages3.0-ReleaseNotes.html → ...s/JakartaServerPages3.1-ReleaseNotes.html b/...s/JakartaServerPages3.0-ReleaseNotes.html → ...s/JakartaServerPages3.1-ReleaseNotes.html
@@ -4,13 +4,21 @@
     <meta http-equiv="content-type" content="text/html; charset=windows-1252">
     <title>Jakarta Server Pages TCK Release Notes</title>
     <!--
-    Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2022 Oracle and/or its affiliates and others.
+    All rights reserved.
+    
     This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at    http://www.eclipse.org/legal/epl-2.0.
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
     This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at    https://www.gnu.org/software/classpath/license.html.
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
 -->
     <style type="text/css">
 <!--
@@ -31,11 +39,11 @@
 </style></head>
   <body>
     <div align="center">
-      <h1>Jakarta EE Server Pages Technology Compatibility Kit, Version 3.0<br>
+      <h1>Jakarta EE Server Pages Technology Compatibility Kit, Version 3.1<br>
         <em class="emphasize">Release Notes, May 2021</em></h1>
     </div>
     <h2><a name="kit_contents">Kit Contents</a></h2>
-    <p>The Jakarta EE Server Pages, Version 3.0 Technology Compatibility Kit
+    <p>The Jakarta EE Server Pages, Version 3.1 Technology Compatibility Kit
       (TCK) includes the following items:</p>
     <ul>
       <li>
@@ -45,7 +53,7 @@ <h2><a name="kit_contents">Kit Contents</a></h2>
       <ul type="square">
         <li>
           <p>A <strong>signature test</strong> that checks that all of the
-            public APIs are supported in the Jakarta EE Server Pages Version 3.0
+            public APIs are supported in the Jakarta EE Server Pages Version 3.1
             implementation that is being tested</p>
         </li>
         <li>
@@ -54,7 +62,7 @@ <h2><a name="kit_contents">Kit Contents</a></h2>
         </li>
         <li>
           <p><strong>End-To-End tests</strong> that demonstrate compliance with
-            the Jakarta EE Server Pages 3.0 specification .</p>
+            the Jakarta EE Server Pages 3.1 specification .</p>
         </li>
       </ul>
     </ul>
@@ -70,14 +78,14 @@ <h2><a name="platform">Platform Notes</a></h2>
       <li>Alpine Linux v3.12</li>
     </ul>
     <p>The Jakarta EE Server Pages TCK tests have been run against the Eclipse
-      Jakarta EE Server Pages Compatible Implementation Version 3.0.</p>
+      Jakarta EE Server Pages Compatible Implementation Version 3.1.</p>
     <hr>
     <h2><a name="install_setup_run">Installing, Setting Up, and Running the
         Jakarta EE Server Pages TCK</a></h2>
-    <p>Refer to the <cite>Jakarta EE Server Pages TCK 3.0 User's Guide</cite> (<a
+    <p>Refer to the <cite>Jakarta EE Server Pages TCK 3.1 User's Guide</cite> (<a
 
-        href="./html-usersguide/title.html" title="Jakarta EE Server Pages TCK 3.0 User's Guide (HTML)">HTML</a>,
-      <a href="./pdf-usersguide/Jakarta-Server-Pages-TCK-Users-Guide.pdf" title="Jakarta EE Server Pages TCK 3.0 User's Guide (PDF)">PDF</a>)
+        href="./html-usersguide/title.html" title="Jakarta EE Server Pages TCK 3.1 User's Guide (HTML)">HTML</a>,
+      <a href="./pdf-usersguide/Jakarta-Server-Pages-TCK-Users-Guide.pdf" title="Jakarta EE Server Pages TCK 3.1 User's Guide (PDF)">PDF</a>)
       for complete instructions on installing, setting up, and running the
       Jakarta EE Server Pages TCK.</p>
     <p>The online version of the JT Harness version 5.0 documentation is

diff --git a/install/jsp/docs/assertions/JakartaServerPagesJavadocAssertions.html b/install/jsp/docs/assertions/JakartaServerPagesJavadocAssertions.html
@@ -3,7 +3,8 @@
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <!--
 
-    Copyright (c) 2018-2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018-2022 Oracle and/or its affiliates and others.
+    All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,7 +25,7 @@
 <body bgcolor="white">
 <br>
 <CENTER>
-<h2> Jakarta Server Pages  - 2.1<br>
+<h2> Jakarta Server Pages  - 3.1<br>
 				JavaDoc Assertion Detail 
 			</h2>
 </CENTER>

diff --git a/install/jsp/docs/assertions/JakartaServerPagesSpecAssertions.html b/install/jsp/docs/assertions/JakartaServerPagesSpecAssertions.html
@@ -3,7 +3,8 @@
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <!--
 
-    Copyright (c) 2018-2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018-2022 Oracle and/or its affiliates and others.
+    All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,7 +25,7 @@
 <body bgcolor="white">
 <br>
 <CENTER>
-<h2> Jakarta Server Pages - 2.1<br>
+<h2> Jakarta Server Pages - 3.1<br>
 				Specification Assertion Detail 
 			</h2>
 </CENTER>

diff --git a/install/jsp/docs/index.html b/install/jsp/docs/index.html
@@ -3,13 +3,21 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
     <!--
-    Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2022 Oracle and/or its affiliates and others.
+    All rights reserved.
+    
     This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at    http://www.eclipse.org/legal/epl-2.0.
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
     This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at    https://www.gnu.org/software/classpath/license.html.
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
 -->
     <title>Welcome to the Jakarta Server Pages TCK</title>
     <style type="text/css">
@@ -28,29 +36,29 @@
   </head>
   <body vlink="#840084" text="#000000" link="#0000ff" bgcolor="#ffffdd" alink="#0000ff">
     <div align="Center">
-      <h1>Welcome to the Jakarta Server Pages TCK, Version 3.0</h1>
+      <h1>Welcome to the Jakarta Server Pages TCK, Version 3.1</h1>
       <h2> <span class="emphasize">Your Starting Point</span></h2>
     </div>
     <hr>
-    <h2>Guide to Jakarta Server Pages TCK 3.0 Documentation</h2>
-    <p>The Jakarta Server Pages TCK 3.0 documentation includes the following:</p>
+    <h2>Guide to Jakarta Server Pages TCK 3.1 Documentation</h2>
+    <p>The Jakarta Server Pages TCK 3.1 documentation includes the following:</p>
     <ul>
-      <li>The <em><a href="JakartaServerPages3.0-ReleaseNotes.html">Jakarta
-            Server Pages 3.0 TCK Release Notes</a></em> provides the information
+      <li>The <em><a href="JakartaServerPages3.1-ReleaseNotes.html">Jakarta
+            Server Pages 3.1 TCK Release Notes</a></em> provides the information
         on the test harness, the test suite and the platforms tested.
         <ul>
           <li>If updates are necessary, new versions of these release notes will
             be made available throught the Jakarta EE Jakarta Server Pages
-            Specification web site: <a href="https://jakarta.ee/specifications/pages/3.0/">https://jakarta.ee/specifications/pages/3.0/</a></li>
+            Specification web site: <a href="https://jakarta.ee/specifications/pages/3.1/">https://jakarta.ee/specifications/pages/3.1/</a></li>
         </ul>
       </li>
       <li>The <em><a href="html-usersguide/toc.html">Jakarta Server Pages
-            Technology Compatibility Kit, Version 3.0 User's Guide</a></em> (or
+            Technology Compatibility Kit, Version 3.1 User's Guide</a></em> (or
         <a href="./pdf-usersguide/Jakarta-Server-Pages-TCK-Users-Guide.pdf"
 
-          title="Jakarta EE Server Pages TCK 3.0 User's Guide (PDF)">PDF</a>)
+          title="Jakarta EE Server Pages TCK 3.1 User's Guide (PDF)">PDF</a>)
         provides the information that you need to install, set up, and run the
-        Jakarta Server Pages TCK, Version 3.0. In addition, the guide provides
+        Jakarta Server Pages TCK, Version 3.1. In addition, the guide provides
         the rules you must comply with to pass the Jakarta Server Pages TCK.</li>
       <li>The <a href="assertions/JakartaServerPagesJavadocAssertions.html">Javadoc
           Assertion List</a> lists all the javadoc assertions that are tested by

diff --git a/install/jsp/other/testsuite.jtt b/install/jsp/other/testsuite.jtt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates and others.
+# Copyright (c) 2018, 2022 Oracle and/or its affiliates and others.
 # All rights reserved.
 #
 # This program and the accompanying materials are made available under the
@@ -16,4 +16,4 @@
 #
 classpath=$TS_HOME/lib/tsharness.jar
 testsuite=com.sun.ts.lib.harness.TS
-name=JavaServer Pages TCK/3.0
+name=Jakarta Server Pages TCK/3.1
diff --git a/internal/docs/jsp/JSPJavadocAssertions.xml b/internal/docs/jsp/JSPJavadocAssertions.xml
@@ -1,7 +1,8 @@
 <?xml version = "1.0" encoding = "US-ASCII"?>
 <!DOCTYPE spec SYSTEM "https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/dtd/javadoc_assertions.dtd">
 <!--
-  Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2018, 2022 Oracle and/or its affiliates and others.
+  All rights reserved.
 
   This program and the accompanying materials are made available under the
   terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,8 +22,8 @@
 	<previous-id>1</previous-id>
 	<technology>JSP</technology>
 	<id>JSP</id>
-	<name>JavaServer Pages(TM)</name>
-	<version>2.2</version>
+	<name>Jakarta Server Pages</name>
+	<version>3.1</version>
 	<assertions>
 		<assertion required = "true" impl-spec = "false" status = "active" testable = "true">
 			<id>1</id>

diff --git a/internal/docs/jsp/JSPMain.xml b/internal/docs/jsp/JSPMain.xml
@@ -22,8 +22,8 @@
 	<next-available-id>2</next-available-id>
 	<previous-id>1</previous-id>
 	<technology>JSP</technology>
-	<id>2.0</id>
-	<name>Java Server(TM) Pages</name>
+	<id>3.1</id>
+	<name>Jakarta Server Pages</name>
 	<version>Proposed Final Draft</version>
 	<location-names>
 		<chapters>

diff --git a/internal/docs/jsp/JSPSpecAssertions.xml b/internal/docs/jsp/JSPSpecAssertions.xml
@@ -1,7 +1,7 @@
 <?xml version = "1.0" encoding = "US-ASCII"?>
 <!DOCTYPE spec SYSTEM "https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/dtd/spec_assertions.dtd">
 <!--
-  Copyright (c) 2018, 2021 Oracle and/or its affiliates and others.
+  Copyright (c) 2018, 2022 Oracle and/or its affiliates and others.
   All rights reserved.
 
   This program and the accompanying materials are made available under the
@@ -25,8 +25,8 @@
 	<previous-id>318</previous-id>
 	<technology>JSP</technology>
 	<id>JSP:SPEC:JSP</id>
-	<name>Java Server(TM) Pages</name>
-	<version>2.2</version>
+	<name>Jakarta Server Pages</name>
+	<version>3.1</version>
 	<location-names>
 		<chapters>
 			<chapter id="0" name="Preface" />

diff --git a/internal/docs/jsp/JSPTCD.txt b/internal/docs/jsp/JSPTCD.txt
@@ -1,8 +1,8 @@
-TCK Coverage Document for JSR-245: JavaServer Pages 2.3 Specification and
-Expression Language 2.3 Specification
+TCK Coverage Document for JSR-245: JavaServer Pages 3.1 Specification and
+Expression Language 5.0 Specification
 
-The Expression Language 2.3 Specification is incorporated by reference in
-the JavaServer Pages 2.3 Specification.
+The Expression Language 3.1 Specification is incorporated by reference in
+the JavaServer Pages 5.0 Specification.
 
 TCK Components:
 ---------------
@@ -31,21 +31,21 @@ Terminology of Metrics
 
 Coverage
 --------
-- Total testable assertions from the JavaServer Pages 2.3 Specification,
-  Expression Language 2.3 Specification, and Javadoc:
+- Total testable assertions from the JavaServer Pages 3.1 Specification,
+  Expression Language 5.1 Specification, and Javadoc:
 
      883 specification assertions
   +  451 API assertions
   ----------------------
     1334 testable assertions
 
-- Number of testable JavaServer Pages Spec assertions tested: 546 (61.83%)
-- Number of testable JavaServer Pages API assertions tested:  370 (82.04%)
+- Number of testable Jakarta Server Pages Spec assertions tested: 546 (61.83%)
+- Number of testable Jakarta Server Pages API assertions tested:  370 (82.04%)
 
 - Total of 68.67% combined specification and api coverage.
 
 Assertions were identified through the use of CTS Tools and hand markup (hand markup was
-required for the JavaServer Pages and Expression Language specifications)
+required for the Jakarta Server Pages and Expression Language specifications)
 
 
 Quality Assurance
@@ -65,7 +65,7 @@ Quality Assurance
 
 Justification of Adequacy
 -------------------------
-The JavaServer Pages and Expression Language tests, distributed as part 
+The Jakarta Server Pages and Expression Language tests, distributed as part 
 of the JavaEE CTS version 7, provides an adequate set of tests to ensure all
 implementations of the Java EE 7 Platform are compatible with the requirements
 defined in these specifications.  As with all TCKs it is impossible to provide tests

diff --git a/user_guides/jakartaee/src/main/jbake/content/intro.adoc b/user_guides/jakartaee/src/main/jbake/content/intro.adoc
@@ -152,7 +152,7 @@ following required and optional Jakarta EE 9.1 technologies:
 
 * Jakarta Enterprise Beans 4.0 +
 * Jakarta Servlet 5.0
-* Jakarta Server Pages 3.0
+* Jakarta Server Pages 3.1
 * Jakarta Expression Language 4.0
 * Jakarta Messaging 3.0
 * Jakarta Transactions 2.0
@@ -195,7 +195,7 @@ The Jakarta EE 9.1 Platform TCK test suite can also be used to test compatibilit
 the following required Jakarta EE 9.1 Web Profile technologies:
 
 * Jakarta Servlet 5.0
-* Jakarta Server Pages 3.0
+* Jakarta Server Pages 3.1
 * Jakarta Expression Language 4.0
 * Jakarta Standard Tag Library 2.0
 * Jakarta Faces 3.0

diff --git a/user_guides/jsp/pom.xml b/user_guides/jsp/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2022 Oracle and/or its affiliates and others.
+    All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,8 +28,8 @@
     <groupId>org.glassfish</groupId>
     <artifactId>tck_jsp</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.1</version>
-    <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Server Pages for Jakarta EE, Release 3.0</name>
+    <version>3.1.0</version>
+    <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Server Pages for Jakarta EE, Release 3.1</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/user_guides/jsp/src/main/jbake/assets/_config.yml b/user_guides/jsp/src/main/jbake/assets/_config.yml
@@ -1,15 +1,15 @@
 remote_theme: jakartaee/jekyll-theme-jakarta-ee
 
-title: [tck_jsp_v3_0]
-description: [Oracle Technology Compatibility Kit User's Guide for Jakarta Server Pages 3.0 for Technology Licensees,
-              Release 3.0]
+title: [tck_jsp_v3_1]
+description: [Oracle Technology Compatibility Kit User's Guide for Jakarta Server Pages 3.1 for Technology Licensees,
+              Release 3.1]
 
 # sidebar links url
 links:
   source: https://github.com/eclipse-ee4j/jakartaee-tck
-  download: https://jakarta.ee/specifications/pages/3.0/
+  download: https://jakarta.ee/specifications/pages/3.1/
   #mailinglist: https://javaee.groups.io/g/tck_jsp_v2_3
   #javadocs:
-  docs: https://jakarta.ee/specifications/pages/3.0/apidocs
+  docs: https://jakarta.ee/specifications/pages/3.1/apidocs
   #faq:
 
diff --git a/user_guides/jsp/src/main/jbake/content/attributes.conf b/user_guides/jsp/src/main/jbake/content/attributes.conf
@@ -1,12 +1,12 @@
 :TechnologyFullName: Jakarta Server Pages
 :TechnologyShortName: Server Pages
 :LegacyAcronym: JSP		   
-:TechnologyVersion: 3.0
-:ReleaseDate: May 2021
-:CopyrightDates: 2017, 2021
-:TechnologyRI: Eclipse GlassFish 6.1
+:TechnologyVersion: 3.1
+:ReleaseDate: March 2022
+:CopyrightDates: 2017, 2022
+:TechnologyRI: Eclipse GlassFish 7.0
 :TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.glassfish
-:SpecificationURL: https://jakarta.ee/specifications/pages/3.0/
+:SpecificationURL: https://jakarta.ee/specifications/pages/3.1/
 :TCKInquiryList: mailto:jakartaee-tck-dev@eclipse.org[jakartaee-tck-dev@eclipse.org]
 :SpecificationInquiryList: mailto:jsp-dev@eclipse.org[jsp-dev@eclipse.org]
 :techID: Pages
@@ -22,13 +22,13 @@
 // for the technology.  Used in config.inc.
 :TechnologyHomeEnv: JAVAEE_HOME
 // Java SE version required.
-:SEversion: 8 (1.8) or 11
+:SEversion: 11
 :AntVersion: 1.10.0+
-:JakartaEEVersion: 9.1
+:JakartaEEVersion: 10.0
 :JavaTestVersion: 5.0
 :jteFileName: <TS_HOME>/bin/ts.jte
 :jtxFileName: <TS_HOME>/bin/ts.jtx
-:TCKPackageName: jakarta-pages-tck-3.0.1.zip
+:TCKPackageName: jakarta-pages-tck-3.1.0.zip
 // Directory names used in examples in using.adoc.
 :sigTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/signaturetest/jsp
 :singleTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/jsp