First pass at updating version for Servlet 6.0

scottmarlow · Feb 23, 2022 · ef9702e · ef9702e
1 parent 41a1123
commit ef9702e
Show file tree

Hide file tree

Showing 16 changed files with 104 additions and 75 deletions.
diff --git a/install/servlet/bin/build.xml b/install/servlet/bin/build.xml
@@ -1,6 +1,6 @@
 <!--
 
-    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
@@ -17,7 +17,7 @@
 
 -->
 
-<project name="Servlet 5.0 TCK" default="usage">
+<project name="Servlet 6.0 TCK" default="usage">
 
     <!-- IMPORTS -->
     <import file="xml/ts.top.import.xml" optional="true"/>

diff --git a/install/servlet/docs/README.txt b/install/servlet/docs/README.txt
@@ -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
@@ -15,7 +15,7 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-The Java Servlet Technology Compatibility Kit 5.0 User's Guide provides
+The Java Servlet Technology Compatibility Kit 6.0 User's Guide provides
 the information you need to install, configure, and run the Servlet
 TCK. The User's Guide also contains the rules you need to pass for
 certification. The guide is available in PDF format at

diff --git a/install/servlet/docs/ReleaseNotes-servlet.html b/install/servlet/docs/ReleaseNotes-servlet.html
@@ -2,8 +2,24 @@
 <html>
   <head>
     <meta http-equiv="content-type" content="text/html; charset=windows-1252">
-    <!--
-    Copyright (c) 2018, 2021 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.    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.    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0-->
+<!--
+
+    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.
+
+    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.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--> 
     <title>Jakarta EE Servlet TCK Release Notes</title>
     <style type="text/css">
    <!--
@@ -24,30 +40,30 @@
   <body>
     <div align="center">
       <h1>Jakarta EE Servlet</h1>
-      <h1>Technology Compatibility Kit, Version 5.0</h1>
+      <h1>Technology Compatibility Kit, Version 6.0</h1>
       <h2> <em class="emphasize">Release Notes, May 2021</em></h2>
     </div>
     <hr size="3" noshade="noshade">
     <h2><a name="kit_contents">Kit Contents</a></h2>
-    The Jakarta EE Servlet, Technology Compatibility Kit Version 5.0 (Servlet
+    The Jakarta EE Servlet, Technology Compatibility Kit Version 6.0 (Servlet
     TCK) includes the following items:
     <ul>
       <li> <strong>Jakarta EE Servlet TCK Signature, API, and End-to-end tests</strong>
         <ul>
           <li> A <strong>Signature test</strong> that checks that all of the
             public APIs are supported or defined as specified in the Jakarta EE
-            Servlet Version 5.0 implementation that is being tested. </li>
+            Servlet Version 6.0 implementation that is being tested. </li>
           <li> <strong>API tests</strong> for all of the public APIs and
-            language elements defined by the Jakarta EE Servlet 5.0
+            language elements defined by the Jakarta EE Servlet 6.0
             Specification. </li>
           <li> <strong>End-to-end tests</strong> for sending http requests to
             the web container or server and receiving responses based on the
-            Jakarta EE Servlet 5.0 Specification.</li>
+            Jakarta EE Servlet 6.0 Specification.</li>
         </ul>
       </li>
-      <li>J<b>akarta EE Servlet Technology Compatibility Kit 5.0 User's Guide</b>
-        (<a href="./html-usersguide/title.html" title="Jakarta EE Servlet TCK 5.0 User's Guide (HTML)">HTML</a>,
-        <a href="./pdf-usersguide/Jakarta-Servlet-TCK-Users-Guide.pdf" title="Jakarta EE Servlet TCK 5.0 User's Guide (PDF)">PDF</a>)
+      <li>J<b>akarta EE Servlet Technology Compatibility Kit 6.0 User's Guide</b>
+        (<a href="./html-usersguide/title.html" title="Jakarta EE Servlet TCK 6.0 User's Guide (HTML)">HTML</a>,
+        <a href="./pdf-usersguide/Jakarta-Servlet-TCK-Users-Guide.pdf" title="Jakarta EE Servlet TCK 6.0 User's Guide (PDF)">PDF</a>)
       </li>
     </ul>
     <hr>
@@ -68,18 +84,18 @@ <h2><a name="platform">Platform Notes</a></h2>
     <hr>
     <h2><a name="install_setup_run">Installing, Setting Up, and Running the
         Jakarta EE Servlet TCK</a></h2>
-    <p>Please refer the <cite>Jakarta EE Servlet 5.0 Technology Compatibility
-        Kit User's Guide</cite> (<a href="./html-usersguide/title.html" title="Jakarta EE Servlet TCK 5.0 User's Guide (HTML)">HTML</a>,
-      <a href="./pdf-usersguide/Jakarta-Servlet-TCK-Users-Guide.pdf" title="Jakarta EE Servlet TCK 5.0 User's Guide (PDF)">PDF</a>)
+    <p>Please refer the <cite>Jakarta EE Servlet 6.0 Technology Compatibility
+        Kit User's Guide</cite> (<a href="./html-usersguide/title.html" title="Jakarta EE Servlet TCK 6.0 User's Guide (HTML)">HTML</a>,
+      <a href="./pdf-usersguide/Jakarta-Servlet-TCK-Users-Guide.pdf" title="Jakarta EE Servlet TCK 6.0 User's Guide (PDF)">PDF</a>)
       for complete instructions on installing, setting up, and running the
-      Jakarta EE Servlet 5.0 TCK. </p>
-    <p>The online version of the JT Harness version 5.0 documentation is
+      Jakarta EE Servlet 6.0 TCK. </p>
+    <p>The online version of the JT Harness version 6.0 documentation is
       available <a href="https://wiki.openjdk.java.net/display/CodeTools/Documentation">here</a>.</p>
     <p>Please take special care to set the JAVA_OPTIONS environment variable as
       described in the User Guide sections "Using the Command Line for TCK Test
       Execution" and "Using the GUI for TCK Test Execution".</p>
     <hr>
-    <p><small><em>Copyright © 2017, 2021 Oracle and/or its affiliates. All
+    <p><small><em>Copyright © 2018, 2022 Oracle and/or its affiliates. All
           rights reserved.</em></small></p>
     <p> </p>
   </body>

diff --git a/install/servlet/docs/assertions/ServletJavadocAssertions.html b/install/servlet/docs/assertions/ServletJavadocAssertions.html
@@ -3,7 +3,8 @@
 <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
@@ -24,7 +25,7 @@
 <body bgcolor="white">
 <br>
 <CENTER>
-<h2>Jakarta Servlet<br>Servlet - 5.0<br>
+<h2>Jakarta Servlet<br>Servlet - 6.0<br>
 				JavaDoc Assertion Detail 
 			</h2>
 </CENTER>

diff --git a/install/servlet/docs/assertions/ServletSpecAssertions.html b/install/servlet/docs/assertions/ServletSpecAssertions.html
@@ -3,7 +3,8 @@
 <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
@@ -24,7 +25,7 @@
 <body bgcolor="white">
 <br>
 <CENTER>
-<h2>Jakarta Servlet<br>Servlet - 5.0<br>
+<h2>Jakarta Servlet<br>Servlet - 6.0<br>
 				Specification Assertion Detail 
 			</h2>
 </CENTER>

diff --git a/install/servlet/docs/index.html b/install/servlet/docs/index.html
@@ -2,16 +2,24 @@
 <html>
   <head>
     <meta http-equiv="content-type" content="text/html; charset=windows-1252">
-    <!--
-    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    terms of the Eclipse Public License v. 2.0, which is available at
+
+    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.
-    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
+
+    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.
+
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-    --> 
+
+--> 
     <title>Welcome to the Jakarta Servlet TCK</title>
     <style type="text/css">
 <!--
@@ -30,24 +38,24 @@
   </head>
   <body>
     <div align="center">
-      <h1>Welcome to the Jakarta EE Servlet TCK, Version 5.0</h1>
+      <h1>Welcome to the Jakarta EE Servlet TCK, Version 6.0</h1>
       <h2>
         <span class="emphasize">Your Starting Point</span></h2>
     </div>
     <hr>
-    <h2>Guide to Jakarta EE Servlet TCK 5.0 Documentation</h2>
-    <p>The Jakarta EE Servlet Technology Compatibility Kit (TCK) 5.0
+    <h2>Guide to Jakarta EE Servlet TCK 6.0 Documentation</h2>
+    <p>The Jakarta EE Servlet Technology Compatibility Kit (TCK) 6.0
       documentation includes the following:</p>
     <ul>
       <li>
         <p>The <a href="ReleaseNotes-servlet.html">Jakarta EE Servlet</a><a href="ReleaseNotes-servlet.html">
-            TCK 5.0 Release Notes</a> provide the information that you need to
+            TCK 6.0 Release Notes</a> provide the information that you need to
           install, set up, and run the Jakarta EE Servlet TCK.</p>
       </li>
       <li>
-        <p>The <em>Jakarta EE Servlet Technology Compatibility Kit 5.0 User's
-            Guide</em> (<a href="./html-usersguide/title.html" title="Jakarta EE Servlet TCK 5.0 User's Guide (HTML)">HTML</a>,
-          <a href="./pdf-usersguide/Jakarta-Servlet-TCK-Users-Guide.pdf" title="Jakarta EE Servlet TCK 5.0 User's Guide (PDF)">PDF</a>)
+        <p>The <em>Jakarta EE Servlet Technology Compatibility Kit 6.0 User's
+            Guide</em> (<a href="./html-usersguide/title.html" title="Jakarta EE Servlet TCK 6.0 User's Guide (HTML)">HTML</a>,
+          <a href="./pdf-usersguide/Jakarta-Servlet-TCK-Users-Guide.pdf" title="Jakarta EE Servlet TCK 6.0 User's Guide (PDF)">PDF</a>)
           provides the information you need to install, configure, and run the
           Jakarta EE Servlet TCK. The User's Guide also contains the rules you
           need to pass for certification.</p>
@@ -64,10 +72,10 @@ <h2>Guide to Jakarta EE Servlet TCK 5.0 Documentation</h2>
       </li>
     </ul>
     <h2>JT Harness Documentation</h2>
-    <p>The online version of the JT Harness version 5.0 documentation is
+    <p>The online version of the JT Harness version 6.0 documentation is
       available <a href="https://wiki.openjdk.java.net/display/CodeTools/Documentation">here</a>.</p>
     <hr>
-    <p><small><em>Copyright © 2017, 2021 Oracle and/or its affiliates. All
+    <p><small><em>Copyright © 2018, 2022 Oracle and/or its affiliates. All
           rights reserved.</em></small></p>
     <p>
     </p>

diff --git a/install/servlet/other/testsuite.jtt b/install/servlet/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
@@ -14,6 +14,6 @@
 #
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
-name=Servlet Compatibility Test Suite Version 5.0
+name=Servlet Compatibility Test Suite Version 6.0
 classpath=$TS_HOME/lib/tsharness.jar
 testsuite=com.sun.ts.lib.harness.TS
diff --git a/internal/docs/servlet/README.txt b/internal/docs/servlet/README.txt
@@ -1,26 +1,26 @@
 Simple README file with instructions to quickly install, setup, configure,
-and run the Servlet TCK 5.0 and related software against the Servlet 5.0 Compatible Implementation. For 
-more detailed instructions please refer to the Servlet 5.0 Users Guide.
+and run the Servlet TCK 6.0 and related software against the Servlet 6.0 Compatible Implementation. For 
+more detailed instructions please refer to the Servlet 6.0 Users Guide.
 
 -----------------------
 Installing the Software
 -----------------------
 Before you can run the Servlet TCK tests, you need to install
 and set up the following software components:
 
-1) Java SE 8
-2) Servlet Compatible Implementation Version 5.0
-3) Servlet TCK Version 5.0
+1) Java 11
+2) Servlet Compatible Implementation Version 6.0
+3) Servlet TCK Version 6.0
 
-1. Download and install Java SE 8 software.
+1. Download and install Java 11 software.
 
-2. Download and install the Servlet 5.0 Compatible Implementation/jarfile.
+2. Download and install the Servlet 6.0 Compatible Implementation/jarfile.
 
    mkdir /ri
    cd /ri
 
 
-3. Download and install the Servlet TCK 5.0 software.
+3. Download and install the Servlet TCK 6.0 software.
 
    mkdir /tck
    cd /tck
@@ -49,10 +49,10 @@ Setup and Configuration of the Servlet TCK
 ------------------------------
 Executing the Servlet TCK Tests
 ------------------------------
-At this point we are ready to run the Servlet TCK tests against the Servlet 5.0
+At this point we are ready to run the Servlet TCK tests against the Servlet 6.0
 Reference Implementation.
 
-1. Start Servlet 5.0 Reference Implementation:
+1. Start Servlet 6.0 Reference Implementation:
 
    cd /ri/glassfish4/glassfish/bin
    ./asadmin start-domain

diff --git a/internal/docs/servlet/ServletJavadocAssertions.xml b/internal/docs/servlet/ServletJavadocAssertions.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE javadoc SYSTEM "https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/dtd/javadoc_assertions.dtd">
 <!--
 
-    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
@@ -24,7 +25,7 @@
 	<technology>Servlet</technology>
 	<id>Servlet</id>
 	<name>Jakarta Servlet</name>
-	<version>5.0</version>
+	<version>6.0</version>
 	<assertions>
 		<assertion required="true" impl-spec="false" status="deprecated" testable="true">
 			<id>1</id>

diff --git a/internal/docs/servlet/ServletSpecAssertions.xml b/internal/docs/servlet/ServletSpecAssertions.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="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
@@ -23,7 +24,7 @@
     <technology>Servlet</technology>
     <id>Servlet</id>
     <name>Jakarta Servlet</name>
-    <version>5.0</version>
+    <version>6.0</version>
     <location-names>
         <chapters>
             <chapter id="1" name="Overview">

diff --git a/internal/docs/servlet/TCD.txt b/internal/docs/servlet/TCD.txt
@@ -1,4 +1,4 @@
-TCK Coverage Document for the Jakarta Servlet 5.0 Specification
+TCK Coverage Document for the Jakarta Servlet 6.0 Specification
 
 
 TCK Components:
@@ -90,10 +90,10 @@ Quality Assurance
 
 Justification of Adequacy
 -------------------------
-The Jakarta Servlet TCK Version 5.0 provides a comprehensive set of tests to ensure
-all implementations of the Servlet 5.0 specification are compatible.  As with all
+The Jakarta Servlet TCK Version 6.0 provides a comprehensive set of tests to ensure
+all implementations of the Servlet 6.0 specification are compatible.  As with all
 TCKs it is impossible to provide tests for 100% assertion coverage.  Note, while
-the CTS may not have tests for all assertions in the Jakarta Servlet 5.0 specification, all
+the CTS may not have tests for all assertions in the Jakarta Servlet 6.0 specification, all
 implementations must be compatible with the specification.
 
 Untested assertions are due to the effects of late specification changes, and

diff --git a/user_guides/jakartaee/src/main/jbake/content/config.adoc b/user_guides/jakartaee/src/main/jbake/content/config.adoc
@@ -875,7 +875,7 @@ client. This time is configurable to allow the servlet container enough
 time to completely invalidate the `HttpSession`. The default value is 10
 milliseconds.
 
-The test `serverpush` in Jakarta Servlet 5.0, uses `httpclient`, a new library
+The test `serverpush` in Jakarta Servlet 6.0, uses `httpclient`, a new library
 in JDK9 which is backported to JDK8. There is a restriction on using
 `httpclient` in JDK8 as the `httpclient` depends on
 java.util.concurrent.flow which is a new class in JDK9. To run the test
@@ -2608,7 +2608,7 @@ element : transport-guarantee
 This is an optional setting on `webservice-endpoint`. The allowable
 values are `NONE`, `INTEGRAL`, and `CONFIDENTIAL`. If not specified, the
 behavior is equivalent to `NONE`. The meaning of each option is the same
-as is defined in the Security chapter of the Jakarta Servlet 5.0 Specification. 
+as is defined in the Security chapter of the Jakarta Servlet 6.0 Specification. 
 This setting will determine the
 scheme and port used to generate the final endpoint address for a web
 service endpoint. For `NONE`, the scheme will be `HTTP` and port will be

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