Author: markt
Date: Fri Feb 21 10:36:09 2020
New Revision: 1874307

URL: http://svn.apache.org/viewvc?rev=1874307&view=rev
Log:
Add Tomcat 10 to which version page

Modified:
    tomcat/site/trunk/docs/whichversion.html
    tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1874307&r1=1874306&r2=1874307&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Fri Feb 21 10:36:09 2020
@@ -2,11 +2,11 @@
 <html lang="en"><head><META http-equiv="Content-Type" content="text/html; 
charset=UTF-8"><meta name="viewport" content="width=device-width, 
initial-scale=1"><link href="res/css/tomcat.css" rel="stylesheet" 
type="text/css"><link href="res/css/fonts/fonts.css" rel="stylesheet" 
type="text/css"><title>Apache Tomcat&reg; - Which Version Do I 
Want?</title><meta name="author" content="Marc A. Saegesser"><meta 
name="author" content="Yoav Shapira"><meta name="author" content="Jean-Frederic 
Clere"></head><body><div id="wrapper"><header id="header"><div 
class="clearfix"><div class="menu-toggler pull-left" tabindex="1"><div 
class="hamburger"></div></div><a href="http://tomcat.apache.org/";><img 
class="tomcat-logo pull-left noPrint" alt="Tomcat Home" 
src="res/images/tomcat.png"></a><h1 class="pull-left">Apache 
Tomcat<sup>&reg;</sup></h1><div class="asf-logos pull-right"><a 
href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img src="https://www.apache.org
 /images/SupportApache-small.png" class="support-asf" alt="Support 
Apache"></a><a href="http://www.apache.org/"; target="_blank" 
class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The 
Apache Software Foundation"></a></div></div></header><main 
id="middle"><div><div id="mainLeft"><div id="nav-wrapper"><form 
action="https://www.google.com/search"; method="get"><div 
class="searchbox"><input value="tomcat.apache.org" name="sitesearch" 
type="hidden"><input aria-label="Search text" placeholder="Search&hellip;" 
required="required" name="q" id="query" 
type="search"><button>GO</button></div></form><div class="asfevents"><a 
href="https://www.apache.org/events/current-event.html";><img 
src="https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event"><br>
               Save the date!
             </a></div><nav><div><h2>Apache Tomcat</h2><ul><li><a 
href="./index.html">Home</a></li><li><a 
href="./taglibs.html">Taglibs</a></li><li><a href="./maven-plugin.html">Maven 
Plugin</a></li></ul></div><div><h2>Download</h2><ul><li><a 
href="./whichversion.html">Which version?</a></li><li><a 
href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a></li><li><a 
href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a></li><li><a 
href="https://tomcat.apache.org/download-70.cgi";>Tomcat 7</a></li><li><a 
href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectors</a></li><li><a 
href="https://tomcat.apache.org/download-native.cgi";>Tomcat 
Native</a></li><li><a 
href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a></li><li><a 
href="https://archive.apache.org/dist/tomcat/";>Archives</a></li></ul></div><div><h2>Documentation</h2><ul><li><a
 href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a></li><li><a 
href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a></li><l
 i><a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a></li><li><a 
href="./connectors-doc/">Tomcat Connectors</a></li><li><a 
href="./native-doc/">Tomcat Native</a></li><li><a 
href="https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki</a></li><li><a 
href="./migration.html">Migration Guide</a></li><li><a 
href="./presentations.html">Presentations</a></li></ul></div><div><h2>Problems?</h2><ul><li><a
 href="./security.html">Security Reports</a></li><li><a 
href="./findhelp.html">Find help</a></li><li><a 
href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a></li><li><a
 href="./lists.html">Mailing Lists</a></li><li><a href="./bugreport.html">Bug 
Database</a></li><li><a href="./irc.html">IRC</a></li></ul></div><div><h2>Get 
Involved</h2><ul><li><a href="./getinvolved.html">Overview</a></li><li><a 
href="./source.html">Source code</a></li><li><a 
href="./ci.html">Buildbot</a></li><li><a 
href="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations</a></li><li><a 
href="./tools
 .html">Tools</a></li></ul></div><div><h2>Media</h2><ul><li><a 
href="https://twitter.com/theapachetomcat";>Twitter</a></li><li><a 
href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a></li><li><a 
href="https://blogs.apache.org/tomcat/";>Blog</a></li></ul></div><div><h2>Misc</h2><ul><li><a
 href="./whoweare.html">Who We Are</a></li><li><a 
href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</a></li><li><a
 href="./heritage.html">Heritage</a></li><li><a 
href="http://www.apache.org";>Apache Home</a></li><li><a 
href="./resources.html">Resources</a></li><li><a 
href="./contact.html">Contact</a></li><li><a 
href="./legal.html">Legal</a></li><li><a 
href="https://www.apache.org/foundation/contributing.html";>Support 
Apache</a></li><li><a 
href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
 href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li><li><a 
href="http://www.apache.org/licenses/";>License</a></li></ul></div></
 nav></div></div><div id="mainRight"><div id="content"><h2 style="display: 
none;">Content</h2><h3 id="Apache_Tomcat_Versions">Apache Tomcat 
Versions</h3><div class="text">
-<p>Apache Tomcat<sup>&reg;</sup> is an open source software implementation of 
the Java Servlet
-and JavaServer Pages technologies. Different versions of Apache Tomcat are
-available for different versions of the Servlet and JSP specifications. The
+<p>Apache Tomcat<sup>&reg;</sup> is an open source software implementation of a
+subset of the Jakarta EE (formally Java EE) technologies. Different versions of
+Apache Tomcat are available for different versions of the specifications. The
 mapping between
-<a 
href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications";>the
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>the
 specifications</a> and the respective Apache Tomcat versions is:
 </p>
 
@@ -17,13 +17,24 @@ specifications</a> and the respective Ap
   <th><strong>JSP Spec</strong></th>
   <th><strong>EL Spec</strong></th>
   <th><strong>WebSocket Spec</strong></th>
-  <th><strong>JASPIC Spec</strong></th>
+  <th><strong>Authentication (JASIC) Spec</strong></th>
   <th><strong>Apache Tomcat Version</strong></th>
   <th><strong>Latest Released Version</strong></th>
   <th><strong>Supported Java Versions</strong></th>
 </tr>
 
 <tr>
+  <td>5.0</td>
+  <td>3.0</td>
+  <td>4.0</td>
+  <td>2.0</td>
+  <td>2.0</td>
+  <td>10.0.x</td>
+  <td>10.0.0-M1</td>
+  <td>8 and later</td>
+</tr>
+
+<tr>
   <td>4.0</td>
   <td>2.3</td>
   <td>3.0</td>
@@ -177,6 +188,15 @@ a number of relatively minor bugs. Beta
 minor bugs. Stable releases are intended for production use and are expected to
 run stably for extended periods of time.</p>
 
+</div><h3 id="Apache_Tomcat_10.x">Apache Tomcat 10.x</h3><div class="text">
+
+<p><strong>Apache Tomcat 10.x</strong> is the current focus of development. It
+builds on Tomcat 9.0.x and implements the <strong>Servlet
+5.0</strong>, <strong>JSP 3.0</strong>, <strong>EL 4.0</strong>, 
<strong>WebSocket 2.0
+</strong> and <strong>Authentication 2.0</strong> specifications (the versions 
required by
+Jakarta EE 9 platform).
+</p>
+
 </div><h3 id="Apache_Tomcat_9.x">Apache Tomcat 9.x</h3><div class="text">
 
 <p><strong>Apache Tomcat 9.x</strong> is the current focus of development. It

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1874307&r1=1874306&r2=1874307&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Fri Feb 21 10:36:09 2020
@@ -11,11 +11,11 @@
 <body>
 
 <section name="Apache Tomcat Versions">
-<p>Apache Tomcat<sup>&#174;</sup> is an open source software implementation of 
the Java Servlet
-and JavaServer Pages technologies. Different versions of Apache Tomcat are
-available for different versions of the Servlet and JSP specifications. The
+<p>Apache Tomcat<sup>&#174;</sup> is an open source software implementation of 
a
+subset of the Jakarta EE (formally Java EE) technologies. Different versions of
+Apache Tomcat are available for different versions of the specifications. The
 mapping between
-<a 
href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications";>the
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>the
 specifications</a> and the respective Apache Tomcat versions is:
 </p>
 
@@ -26,13 +26,24 @@ specifications</a> and the respective Ap
   <th><strong>JSP Spec</strong></th>
   <th><strong>EL Spec</strong></th>
   <th><strong>WebSocket Spec</strong></th>
-  <th><strong>JASPIC Spec</strong></th>
+  <th><strong>Authentication (JASIC) Spec</strong></th>
   <th><strong>Apache Tomcat Version</strong></th>
   <th><strong>Latest Released Version</strong></th>
   <th><strong>Supported Java Versions</strong></th>
 </tr>
 
 <tr>
+  <td>5.0</td>
+  <td>3.0</td>
+  <td>4.0</td>
+  <td>2.0</td>
+  <td>2.0</td>
+  <td>10.0.x</td>
+  <td>10.0.0-M1</td>
+  <td>8 and later</td>
+</tr>
+
+<tr>
   <td>4.0</td>
   <td>2.3</td>
   <td>3.0</td>
@@ -191,6 +202,18 @@ run stably for extended periods of time.
 </section>
 
 
+<section name="Apache Tomcat 10.x">
+
+<p><strong>Apache Tomcat 10.x</strong> is the current focus of development. It
+builds on Tomcat 9.0.x and implements the <strong>Servlet
+5.0</strong>, <strong>JSP 3.0</strong>, <strong>EL 4.0</strong>, 
<strong>WebSocket 2.0
+</strong> and <strong>Authentication 2.0</strong> specifications (the versions 
required by
+Jakarta EE 9 platform).
+</p>
+
+</section>
+
+
 <section name="Apache Tomcat 9.x">
 
 <p><strong>Apache Tomcat 9.x</strong> is the current focus of development. It
@@ -210,6 +233,8 @@ the following significant improvements:
 </ul>
 
 </section>
+
+
 <section name="Apache Tomcat 8.x">
 
 <p><strong>Apache Tomcat 8.0.x</strong> builds on Tomcat 7.0.x and implements 
the



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to