Addition pass for WebSocket version updates

scottmarlow · Feb 23, 2022 · 2aac475 · 2aac475
1 parent ecb9cc6
commit 2aac475
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 44 deletions.
diff --git a/install/websocket/docs/WebSocketJavadocAssertions.html b/install/websocket/docs/WebSocketJavadocAssertions.html
@@ -3,7 +3,7 @@
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <!--
 
-    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
@@ -25,7 +25,7 @@
 <body bgcolor="white">
 <br>
 <CENTER>
-<h2>Jakarta API for WebSocket<br>WebSocket - 2.0<br>
+<h2>Jakarta API for WebSocket<br>WebSocket - 2.1<br>
 				JavaDoc Assertion Detail 
 			</h2>
 </CENTER>

diff --git a/...et/docs/WebSocketTCK2.0-ReleaseNotes.html → ...et/docs/WebSocketTCK2.1-ReleaseNotes.html b/...et/docs/WebSocketTCK2.0-ReleaseNotes.html → ...et/docs/WebSocketTCK2.1-ReleaseNotes.html
@@ -4,10 +4,17 @@
     <meta http-equiv="content-type" content="text/html; charset=windows-1252">
     <title>Jakarta WebSocket TCK Release Notes</title>
     <!--
-        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
     -->
     <style type="text/css">
 <!--
@@ -28,23 +35,23 @@
 </style></head>
   <body>
     <div align="center">
-      <h1>Jakarta EE WebSocket Technology Compatibility Kit, Version 2.0<br>
-        <em class="emphasize">Release Notes, May 2021</em></h1>
+      <h1>Jakarta EE WebSocket Technology Compatibility Kit, Version 2.1<br>
+        <em class="emphasize">Release Notes, March 2022</em></h1>
     </div>
     <h2><a name="kit_contents">Kit Contents</a></h2>
-    <p>The Jakarta EE WebSocket, Version 2.0 Technology Compatibility Kit (TCK)
+    <p>The Jakarta EE WebSocket, Version 2.1 Technology Compatibility Kit (TCK)
       includes the following items:</p>
     <ul>
       <li><strong>Jakarta EE WebSocket TCK tests signature, API, and End-to-End
           tests:</strong></li>
       <ul type="square">
         <li><strong>Signature test</strong> that checks that all of the public
-          APIs are supported in the Jakarta EE WebSocket Version 2.0
+          APIs are supported in the Jakarta EE WebSocket Version 2.1
           implementation that is being tested</li>
         <li><strong>API tests</strong> for the public APIs under the <code>jakarta.websocket</code>
           and <code>jakarta.websocket.server</code> packages</li>
         <li><strong>Specification tests</strong> for testable assertions
-          required by the Jakarta EE WebSocket 2.0 Specification</li>
+          required by the Jakarta EE WebSocket 2.1 Specification</li>
       </ul>
     </ul>
     <hr>
@@ -66,23 +73,23 @@ <h2><a name="platform">Platform Notes</a></h2>
       <li>Alpine Linux v3.12</li>
     </ul>
     <p>The Jakarta EE WebSocket TCK tests have been run against the following
-      Jakarta EE WebSocket 2.0 Compatible Implementations:</p>
+      Jakarta EE WebSocket 2.1 Compatible Implementations:</p>
     <ul>
-      <li>Eclipse Tyrus Version 2.0 and Eclipse GlassFish 6.0 or 6.1</li>
+      <li>Eclipse GlassFish 7.0</li>
     </ul>
     <hr>
     <h2><a name="install_setup_run">Installing, Setting Up, and Running the
         JavaTM API for WebSocket TCK</a></h2>
-    <p>Refer to the <a href="html-usersguide/title.html" title="Jakarta EE WebSocket TCK 2.0 User's Guide (HTML)">Jakarta
-        EE WebSocket Technology Compatibility Kit, Version 2.0 User's Guide</a>
-      (or <a href="./pdf-usersguide/Jakarta-WebSocket-TCK-Users-Guide.pdf" title="Jakarta EE WebSocket TCK 2.0 User's Guide (PDF)">PDF</a>)
+    <p>Refer to the <a href="html-usersguide/title.html" title="Jakarta EE WebSocket TCK 2.1 User's Guide (HTML)">Jakarta
+        EE WebSocket Technology Compatibility Kit, Version 2.1 User's Guide</a>
+      (or <a href="./pdf-usersguide/Jakarta-WebSocket-TCK-Users-Guide.pdf" title="Jakarta EE WebSocket TCK 2.1 User's Guide (PDF)">PDF</a>)
       for complete instructions on installing, setting up, and running the
       Jakarta EE WebSocket TCK. </p>
     <p>The online version of the JT Harness version 5.0 documentation is
       available <a href="https://wiki.openjdk.java.net/display/CodeTools/Documentation">here</a>.</p>
     <hr>
     <h2><a name="attributions">Attributions</a></h2>
-    <p>The Jakarta EE WebSocket 2.0 TCK includes software developed by the
+    <p>The Jakarta EE WebSocket 2.1 TCK includes software developed by the
       Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org/</a>),
       and the JDOMTM Project (<a href="http://www.jdom.org/">http://www.jdom.org/</a>).
       The Apache Ant Contrib project is located at <a href="http://ant-contrib.sourceforge.net/">http://ant-contrib.sourceforge.net/</a>.</p>

diff --git a/install/websocket/docs/index.html b/install/websocket/docs/index.html
@@ -3,9 +3,16 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=windows-1252">
     <!--
-    Copyright (c) 2018, 2021 Oracle and/or its affiliates. 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.
+    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>Welcome to the Jakarta EE WebSocket TCK</title>
     <style type="text/css">
@@ -25,26 +32,26 @@
 
     alink="#0000ff">
     <div align="Center">
-      <h1>Welcome to the Jakarta EE WebSocket TCK, Version 2.0</h1>
+      <h1>Welcome to the Jakarta EE WebSocket TCK, Version 2.1</h1>
       <h2> <span class="emphasize">Your Starting Point</span></h2>
     </div>
     <hr>
-    <h2>Guide to Jakarta EE WebSocket TCK 2.0 Documentation</h2>
-    <p>The Jakarta EE WebSocket TCK 2.0 documentation includes the following:</p>
+    <h2>Guide to Jakarta EE WebSocket TCK 2.1 Documentation</h2>
+    <p>The Jakarta EE WebSocket TCK 2.1 documentation includes the following:</p>
     <ul>
-      <li>The <em><a href="WebSocketTCK2.0-ReleaseNotes.html">Jakarta EE
+      <li>The <em><a href="WebSocketTCK2.1-ReleaseNotes.html">Jakarta EE
             WebSocket TCK Release Notes</a></em> provides the information on the
         test harness, the test suite and the platforms tested.
         <ul>
           <li>The Release Notes updates may be available from the Jakarta EE
-            WebSocket specification web site: <a href="https://jakarta.ee/specifications/websocket/2.0/">https://jakarta.ee/specifications/websocket/2.0/</a></li>
+            WebSocket specification web site: <a href="https://jakarta.ee/specifications/websocket/2.1/">https://jakarta.ee/specifications/websocket/2.1/</a></li>
         </ul>
       </li>
-      <li> The <a href="./html-usersguide/title.html" title="Jakarta EE WebSocket TCK 2.0 User's Guide (HTML)">Jakarta
-          EE WebSocket Technology Compatibility Kit, Version 2.0 User's Guide</a>
-        (or <a href="./pdf-usersguide/Jakarta-WebSocket-TCK-Users-Guide.pdf" title="Jakarta EE WebSocket TCK 2.0 User's Guide (PDF)">PDF</a>)
+      <li> The <a href="./html-usersguide/title.html" title="Jakarta EE WebSocket TCK 2.1 User's Guide (HTML)">Jakarta
+          EE WebSocket Technology Compatibility Kit, Version 2.1 User's Guide</a>
+        (or <a href="./pdf-usersguide/Jakarta-WebSocket-TCK-Users-Guide.pdf" title="Jakarta EE WebSocket TCK 2.1 User's Guide (PDF)">PDF</a>)
         provides the information that you need to install, set up, and run the
-        Jakarta EE WebSocket TCK, Version 2.0. In addition, the guide provides
+        Jakarta EE WebSocket TCK, Version 2.1. In addition, the guide provides
         the rules you must comply with to pass the Jakarta EE WebSocket TCK.</li>
       <li>The <a href="assertions/WebSocketJavadocAssertions.html">Javadoc
           Assertion List</a> lists all the javadoc assertions that are tested by
@@ -55,7 +62,7 @@ <h2>JT Harness Documentation</h2>
       available <a href="https://wiki.openjdk.java.net/display/CodeTools/Documentation">here</a>.</p>
     <hr>
     <p><cite><small></small></cite></p>
-    <address><small> Copyright © 2014, 2021 Oracle and/or its affiliates. All
+    <address><small> Copyright © 2014, 2022 Oracle and/or its affiliates and others. All
         rights reserved. </small></address>
     <cite>
       <p></p>

diff --git a/install/websocket/other/testsuite.jtt b/install/websocket/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=WebSocket Compatibility Test Suite Version 2.0
+name=WebSocket Compatibility Test Suite Version 2.1
 classpath=$TS_HOME/lib/tsharness.jar
 testsuite=com.sun.ts.lib.harness.TS
diff --git a/internal/docs/jakartaee/JavaEESpecAssertions.xml b/internal/docs/jakartaee/JavaEESpecAssertions.xml
@@ -1,7 +1,8 @@
 <!DOCTYPE spec SYSTEM "https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/dtd/spec_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
@@ -274,7 +275,7 @@
                     <section id = "11" name = "Web Services for Java EE 1.4 Requirements"/>
                     <section id = "12" name = "Java API for XML-based RPC (JAX-RPC) 1.1 Requirements (Optional)"/>
                     <section id = "13" name = "Java API for RESTful Web Services (JAX-RS) 2.1 Requirements"/>
-                    <section id = "14" name = "Java API for WebSocket 1.1 (WebSocket) Requirements"/>
+                    <section id = "14" name = "Java API for WebSocket 2.1 (WebSocket) Requirements"/>
                     <section id = "15" name = "Java API for JSON Processing 1.1 (JSON-P) Requirements"/>
                     <section id = "16" name = "Java API for JSON Binding 1.0 (JSON-B) Requirements"/>
                     <section id = "17" name = "Concurrency Utilities for Java EE 1.0 (Concurrency Utilities) Requirements"/>

diff --git a/internal/docs/websocket/TCD.txt b/internal/docs/websocket/TCD.txt
@@ -89,10 +89,10 @@ Quality Assurance
 
 Justification of Adequacy
 -------------------------
-The WebSocket TCK Version 1.0 provides a comprehensive set of tests to ensure
-all implementations of the WebSocket 1.0 specification are compatible.  As with all
+The WebSocket TCK Version 2.1 provides a comprehensive set of tests to ensure
+all implementations of the WebSocket 2.1 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 WebSocket 1.0 specification, all
+the CTS may not have tests for all assertions in the WebSocket 2.1 specification, all
 implementations must be compatible with the specification.
 
 Untested assertions are due to the effects of late specification changes, and

diff --git a/internal/docs/websocket/WebSocketJavadocAssertions.xml b/internal/docs/websocket/WebSocketJavadocAssertions.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE javadoc 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 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,7 +25,7 @@
   <technology>WebSocket</technology>
   <id>WebSocket</id>
   <name>JavaTM API for WebSocket</name>
-  <version>1.1</version>
+  <version>2.1</version>
   <assertions>
     <!-- ********************************************************************************** -->
     <!-- ********************************************************************************** -->

diff --git a/internal/docs/websocket/WebSocketJavadocAssertions10.html b/internal/docs/websocket/WebSocketJavadocAssertions10.html
@@ -3,7 +3,8 @@
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <!--
 
-    Copyright (c) 2018 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>JavaTM API for WebSocket<br>WebSocket - 1.0<br>
+<h2>JavaTM API for WebSocket<br>WebSocket - 2.1<br>
 				JavaDoc Assertion Detail 
 			</h2>
 </CENTER>

diff --git a/user_guides/jakartaee/src/main/jbake/content/intro.adoc b/user_guides/jakartaee/src/main/jbake/content/intro.adoc
@@ -160,7 +160,7 @@ following required and optional Jakarta EE 9.1 technologies:
 * Jakarta Connectors 2.0
 * Jakarta Enterprise Web Services 2.0 (optional)
 * Jakarta RESTful Web Services 3.0
-* Jakarta WebSocket 2.0
+* Jakarta WebSocket 2.1
 * Jakarta JSON Processing 2.0
 * Jakarta JSON Binding 2.0
 * Jakarta Concurrency 2.0
@@ -200,7 +200,7 @@ the following required Jakarta EE 9.1 Web Profile technologies:
 * Jakarta Standard Tag Library 2.0
 * Jakarta Faces 3.0
 * Jakarta RESTful Web Services 3.0
-* Jakarta WebSocket 2.0
+* Jakarta WebSocket 2.1
 * Jakarta JSON Processing 2.0
 * Jakarta JSON Binding 2.0
 * Jakarta Common Annotations 2.0

diff --git a/user_guides/websocket/src/main/jbake/content/attributes.conf b/user_guides/websocket/src/main/jbake/content/attributes.conf
@@ -2,7 +2,7 @@
 :TechnologyShortName: WebSocket
 :LegacyAcronym: WebSocket		   
 :TechnologyVersion: 2.1
-:ReleaseDate: TBD 2022
+:ReleaseDate: March 2022
 :CopyrightDates: 2017, 2022
 :TechnologyRI: Eclipse Tyrus 2.0
 :TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.tyrus