From cf71a697d0850eb4c04a739eda1c95df2b99ab4e Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Mon, 11 Apr 2022 11:30:11 +0100
Subject: [PATCH] Additional Jakarta EE / Glassfish version updates

---
 install/servlet/docs/ReleaseNotes-servlet.html            | 8 ++++----
 .../servlet/src/main/jbake/content/install-server.inc     | 4 ++--
 user_guides/servlet/src/main/jbake/content/rebuild.inc    | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/install/servlet/docs/ReleaseNotes-servlet.html b/install/servlet/docs/ReleaseNotes-servlet.html
index df437b9633..abab5c3fdc 100644
--- a/install/servlet/docs/ReleaseNotes-servlet.html
+++ b/install/servlet/docs/ReleaseNotes-servlet.html
@@ -69,11 +69,11 @@ <h2><a name="kit_contents">Kit Contents</a></h2>
     <hr>
     <h2><a name="platform">Platform Notes</a></h2>
     <ul>
-      <li> The Jakarta EE Servlet TCK tests have been built with JDK 8 (1.8) and
-        tested with the Java™ Platform, Standard Edition SDK, Version 8 and 11.
+      <li> The Jakarta EE Servlet TCK tests have been built with JDK 11 and
+        tested with the Java™ Platform, Standard Edition SDK, Version 11.
       </li>
-      <li>This TCK was verified with a Jakarta EE 9.1 compatible Platform,
-        Eclipse GlassFish 6.0 or 6.1. </li>
+      <li>This TCK was verified with a Jakarta EE 10 compatible Platform,
+        Eclipse GlassFish 7.0. </li>
       <li> In the instructions in this document, variables in angle brackets
         need to be expanded for each platform. For example, <code>&lt;TS_HOME&gt;</code>
         becomes <code>$TS_HOME</code> on Solaris/Linux and <code>%TS_HOME%</code>
diff --git a/user_guides/servlet/src/main/jbake/content/install-server.inc b/user_guides/servlet/src/main/jbake/content/install-server.inc
index 27eaba71f7..5c031a5149 100644
--- a/user_guides/servlet/src/main/jbake/content/install-server.inc
+++ b/user_guides/servlet/src/main/jbake/content/install-server.inc
@@ -5,13 +5,13 @@ For standalone technologies, no server may be required, and the
 below lines can be removed.
 This is used in install.adoc in section 3.2.
 ////
-.  Install the Jakarta EE 9 CI software (the servlet Web container used
+.  Install the Jakarta EE 10 CI software (the servlet Web container used
 for running the {TechnologyShortName} TCK with the
 {TechnologyShortName} {TechnologyVersion} CI), if it is not already
 installed. +
 Download and install the Servlet Web container with the
 {TechnologyShortName} {TechnologyVersion} CI used for running the
 {TechnologyShortName} TCK {TechnologyVersion}, represented by the Jakarta
-EE 9 CI.
+EE 10 CI.
 If you intend to use {TechnologyRI}, you may obtain this software via the
 downloads tab from the project website: {TechnologyRIURL}.
diff --git a/user_guides/servlet/src/main/jbake/content/rebuild.inc b/user_guides/servlet/src/main/jbake/content/rebuild.inc
index 4850b619c2..3112f9d8e7 100644
--- a/user_guides/servlet/src/main/jbake/content/rebuild.inc
+++ b/user_guides/servlet/src/main/jbake/content/rebuild.inc
@@ -24,7 +24,7 @@ published in a Java SE environment are located under
 `$TS_HOME/classes`.
 
 The {TechnologyShortName} TCK comes with prebuilt test WAR files for
-deployment on Jakarta EE 9 CI {TechnologyRI}, which provides a Servlet–compliant Web
+deployment on Jakarta EE 10 CI {TechnologyRI}, which provides a Servlet–compliant Web
 container. The WAR files are {TechnologyRI}-specific, with {TechnologyRI}'s servlet
 class and {TechnologyRI}'s servlet defined in the `web.xml` deployment
 descriptor. To run the TCK tests against the VI in a Servlet–compliant
@@ -51,7 +51,7 @@ B.1 Overview
 
 The set of prebuilt archives and classes that ship with the
 {TechnologyShortName} TCK were built using the {TechnologyRI} Jakarta EE Compatible
-Implementation, and must be deployed on a Jakarta EE 9 CI and run against
+Implementation, and must be deployed on a Jakarta EE 10 CI and run against
 the {TechnologyRI} CI.
 
 The prebuilt {TechnologyRI}-specific Servlet–compliant WAR files are located