Author: markt
Date: Thu May 1 10:23:15 2025
New Revision: 1925351
URL: http://svn.apache.org/viewvc?rev=1925351&view=rev
Log:
Review text, particularly for older versions
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=1925351&r1=1925350&r2=1925351&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Thu May 1 10:23:15 2025
@@ -228,7 +228,7 @@ which one is right for you. More detail
the associated release notes.</p>
<p>Please note that although we offer downloads and documentation of older
-releases, such as Apache Tomcat 7.x, we strongly encourage users to use the
+releases, such as Apache Tomcat 9.x, we strongly encourage users to use the
latest stable version of Apache Tomcat whenever possible. We recognize that
upgrading across major versions may not be a trivial task, and some support is
still offered on the mailing list for users of old versions. However, because
@@ -270,7 +270,7 @@ run stably for extended periods of time.
</div><h3 id="Supported_Version_Details">Supported Version Details</h3><div
class="text">
-<h3 id="Apache_Tomcat_11.0.x_(Stable)">Apache Tomcat 11.0.x (Stable)</h3><div
class="text">
+<div class="subsection"><h4 id="Apache_Tomcat_11.0.x_(Stable)">Apache Tomcat
11.0.x (Stable)</h4><div class="text">
<p><strong>Apache Tomcat 11.0.x</strong> is the current focus of development.
It
builds on Tomcat 10.1.x and implements the <strong>Servlet 6.1</strong>,
@@ -279,10 +279,10 @@ builds on Tomcat 10.1.x and implements t
versions required by Jakarta EE 11 platform).
</p>
-</div>
+</div></div>
-<h3 id="Apache_Tomcat_10.1.x_(Stable)">Apache Tomcat 10.1.x (Stable)</h3><div
class="text">
+<div class="subsection"><h4 id="Apache_Tomcat_10.1.x_(Stable)">Apache Tomcat
10.1.x (Stable)</h4><div class="text">
<p><strong>Apache Tomcat 10.1.x</strong> builds on Tomcat 10.0.x and implements
the <strong>Servlet 6.0</strong>, <strong>JSP 3.1</strong>, <strong>EL
@@ -290,10 +290,10 @@ the <strong>Servlet 6.0</strong>, <stron
3.0</strong> specifications (the versions required by Jakarta EE 10 platform).
</p>
-</div>
+</div></div>
-<h3 id="Apache_Tomcat_9.x_(Stable)">Apache Tomcat 9.x (Stable)</h3><div
class="text">
+<div class="subsection"><h4 id="Apache_Tomcat_9.x_(Stable)">Apache Tomcat 9.x
(Stable)</h4><div class="text">
<p><strong>Apache Tomcat 9.x</strong> builds on Tomcat 8.0.x and 8.5.x and
implements the <strong>Servlet 4.0</strong>, <strong>JSP 2.3</strong>,
@@ -311,10 +311,33 @@ improvements:
<li>Adds support for TLS virtual hosting (SNI)</li>
</ul>
-</div>
+<p>Tomcat 9 is the last major Tomcat version supporting Java EE. Therefore, the
+Tomcat community intends to provide support for Tomcat 9 beyond the 10 years
for
+which major Tomcat versions are typically supported.</p>
+
+<p>Extended support will be provided via a new 9.1.x branch that will be
started
+when 9.0.x reaches end of support. The APR/Native Connector will not be
+available in Tomcat 9.1.x.</p>
+
+<p>Support for NIO+OpenSSL and NIO2+OpenSSL will continue in Tomcat 9.1.x via
+Tomcat Native 2.x.</p>
+
+<p>Back-ports of security fixes, bug fixes and new features will continue for
+9.1.x as they have done for 9.0.x.</p>
+
+<p>End of support for Tomcat 9.0.x is expected <b>no earlier than</b> 31 March
+2027.</p>
+
+<p>End of support for Tomcat 9.1.x has not been determined. At least 12
+months notice will be provided for 9.1.x end of support.</p>
+</div></div>
+
</div><h3 id="Unsupported_Version_Details">Unsupported Version
Details</h3><div class="text">
<h3 id="Apache_Tomcat_10.0.x_(superseded)">Apache Tomcat 10.0.x
(superseded)</h3><div class="text">
+<p><strong>Apache Tomcat 10.0.x</strong> is available for download from the
+archives.</p>
+
<p><strong>Apache Tomcat 10.0.x</strong> 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
@@ -331,6 +354,9 @@ upgrade to Tomcat 10.1.x or later.</p>
<h3 id="Apache_Tomcat_8.x_(archived)">Apache Tomcat 8.x (archived)</h3><div
class="text">
+<p><strong>Apache Tomcat 8.x</strong> is available for download from the
+archives.</p>
+
<p><strong>Apache Tomcat 8.0.x</strong> builds on Tomcat 7.0.x and implements
the
<strong>Servlet 3.1</strong>, <strong>JSP 2.3</strong>, <strong>EL 3.0</strong>
and <strong>WebSocket 1.1</strong> specifications. In addition
@@ -356,9 +382,7 @@ created at that time, as Java EE specifi
only finalized a few years later).
</p>
-<p>Tomcat 8.5 is thought as a replacement for Tomcat 8.0. Please refer to
-<a href="/migration.html">Migration guide</a> for guidance on migrating to
-Tomcat 8.5.</p>
+<p>Tomcat 8.5 was a replacement for Tomcat 8.0.</p>
<p>
Apache Tomcat 8.5.x includes the following significant improvements:
@@ -378,25 +402,28 @@ Apache Tomcat 8.5.x includes the followi
<li>Support for Comet API</li>
</ul>
-<p>There are significant changes in many areas under the hood, resulting in
+<p>There were significant changes in many areas under the hood, resulting in
improved performance, stability, and total cost of ownership. Please refer
to the Apache Tomcat 8.5 Changelog for details.
</p>
<p>Users of Tomcat 8.0 should be aware that Tomcat 8.0 has now reached
<a href="tomcat-80-eol.html">end of life</a>. Users of Tomcat 8.0.x should
-upgrade to Tomcat 8.5.x or later.</p>
+upgrade to Tomcat 9.x or later.</p>
<p>Users of Tomcat 8.5 should be aware that Tomcat 8.5 has now reached
<a href="tomcat-85-eol.html">end of life</a>. Users of Tomcat 8.5.x should
-upgrade to Tomcat 9.0.x or later.</p>
+upgrade to Tomcat 9.x or later.</p>
</div>
<h3 id="Apache_Tomcat_7.x_(archived)">Apache Tomcat 7.x (archived)</h3><div
class="text">
-<p><strong>Apache Tomcat 7.x</strong> builds upon the improvements made in
+<p><strong>Apache Tomcat 7.x</strong> is available for download from the
+archives.</p>
+
+<p><strong>Apache Tomcat 7.x</strong> built upon the improvements made in
Tomcat 6.0.x and implements the <strong>Servlet 3.0</strong>,
<strong>JSP 2.2</strong>, <strong>EL 2.2</strong> and
<strong>WebSocket 1.1</strong> specifications. In addition
@@ -412,13 +439,16 @@ to that, it includes the following impro
<p>Users of Tomcat 7 should be aware that Tomcat 7 has now reached
<a href="tomcat-70-eol.html">end of life</a>. Users of Tomcat 7.x should
upgrade
-to Tomcat 8.5.x or later.</p>
+to Tomcat 9.x or later.</p>
</div>
<h3 id="Apache_Tomcat_6.x_(archived)">Apache Tomcat 6.x (archived)</h3><div
class="text">
+<p><strong>Apache Tomcat 6.x</strong> is available for download from the
+archives.</p>
+
<p><strong>Apache Tomcat 6.x</strong> builds upon the improvements made in
Tomcat 5.5.x and implements the <strong>Servlet 2.5</strong> and
<strong>JSP 2.1</strong> specifications. In addition to that, it includes the
@@ -432,7 +462,7 @@ following improvements:
<p>Users of Tomcat 6 should be aware that Tomcat 6 has now reached
<a href="tomcat-60-eol.html">end of life</a>. Users of Tomcat 6.x should
-upgrade to Tomcat 7.x or later.</p>
+upgrade to Tomcat 9.x or later.</p>
</div>
@@ -468,7 +498,7 @@ it in production</li>
<p>Users of Tomcat 5 should be aware that Tomcat 5 has now reached
<a href="tomcat-55-eol.html">end of life</a>. Users of Tomcat 5.x should
-upgrade to Tomcat 7.x or later.</p>
+upgrade to Tomcat 9.x or later.</p>
</div>
@@ -505,7 +535,7 @@ also supports web applications built for
specifications with no changes.</p>
<p>Users of Tomcat 4 should be aware that Tomcat 4 has now reached
-end of life. Users of Tomcat 4.x should upgrade to Tomcat 7.x or
+end of life. Users of Tomcat 4.x should upgrade to Tomcat 9.x or
later.</p>
</div>
@@ -515,16 +545,6 @@ later.</p>
<p><strong>Apache Tomcat 3.x</strong> is available for download from the
archives.</p>
-<ul>
-<li>Version <strong>3.3</strong> is the current production quality release for
-the Servlet 2.2 and JSP 1.1 specifications. Apache Tomcat 3.3 is the latest
-continuation of the Apache Tomcat 3.x architecture; it is more advanced then
3.2.4,
-which is the 'old' production quality release.</li>
-<li>Version 3.2.4 is the 'old' production quality release and is now in
-maintenance only mode.</li>
-<li>Version 3.1.1 is a legacy release.</li>
-</ul>
-
<p>
All <strong>Apache Tomcat 3.x</strong> releases trace their heritage back to
the
original Servlet and JSP implementations that Sun donated to the Apache
@@ -532,36 +552,27 @@ Software Foundation. The 3.x versions a
2.2</strong> and <strong>JSP 1.1</strong> specifications.
</p>
-<p><strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 is the current
production
-quality release. It continues the refactoring that was begun in version 3.2 and
-carries it to its logical conclusion. Version 3.3 provides a much more modular
-design and allows the servlet container to be customized by adding and removing
-modules that control the processing of servlet requests. This version also
-contains many performance improvements.</p>
+<p><strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 was the final production
+quality release. It continued the refactoring that was begun in version 3.2 and
+carried it to its logical conclusion. Version 3.3 provided a much more modular
+design and allowed the servlet container to be customized by adding and
removing
+modules that controlled the processing of servlet requests. This version also
+contained many performance improvements.</p>
<p><strong>Apache Tomcat 3.2.x</strong>. Version 3.2 added few new features
since 3.1; the major effort was a refactoring of the internals to improve
-performance and stability. The 3.2.1 release, like 3.1.1, was a security
-patch. Version 3.2.2 fixed a large number of bugs and all known
-specification compliance issues. Version 3.2.3 was a security update that
-closes a serious security hole. Version 3.2.4 is a minor bug fix release.
-All users of Apache Tomcat versions prior to 3.2.3 should upgrade as soon as
-possible. With the exception of fixes for critical security related bugs,
-development on the Apache Tomcat 3.2.x branch has stopped.</p>
+performance and stability.</p>
<p><strong>Apache Tomcat 3.1.x</strong>. The 3.1 release contained several
improvements over Apache Tomcat 3.0, including servlet reloading, WAR file
support and added connectors for the IIS and Netscape web servers. The
-latest maintenance release, 3.1.1, contained fixes for security problems.
-There is no active development ongoing for Apache Tomcat 3.1.x. Users of
Apache Tomcat
-3.1 should update to 3.1.1 to close the security holes and they are
-strongly encouraged to migrate to the current production release, Apache Tomcat
-3.3.</p>
+last maintenance release, 3.1.1, contained fixes for security problems.
+</p>
<p><strong>Apache Tomcat 3.0.x</strong>. Initial Apache Tomcat release.</p>
<p>Users of Tomcat 3 should be aware that Tomcat 3 has now reached
-end of life. Users of Tomcat 3.x should upgrade to Tomcat 7.x or
+end of life. Users of Tomcat 3.x should upgrade to Tomcat 9.x or
later.</p>
</div>
Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1925351&r1=1925350&r2=1925351&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Thu May 1 10:23:15 2025
@@ -239,7 +239,7 @@ which one is right for you. More detail
the associated release notes.</p>
<p>Please note that although we offer downloads and documentation of older
-releases, such as Apache Tomcat 7.x, we strongly encourage users to use the
+releases, such as Apache Tomcat 9.x, we strongly encourage users to use the
latest stable version of Apache Tomcat whenever possible. We recognize that
upgrading across major versions may not be a trivial task, and some support is
still offered on the mailing list for users of old versions. However, because
@@ -285,7 +285,7 @@ run stably for extended periods of time.
<section name="Supported Version Details">
-<section name="Apache Tomcat 11.0.x (Stable)">
+<subsection name="Apache Tomcat 11.0.x (Stable)">
<p><strong>Apache Tomcat 11.0.x</strong> is the current focus of development.
It
builds on Tomcat 10.1.x and implements the <strong>Servlet 6.1</strong>,
@@ -294,10 +294,10 @@ builds on Tomcat 10.1.x and implements t
versions required by Jakarta EE 11 platform).
</p>
-</section>
+</subsection>
-<section name="Apache Tomcat 10.1.x (Stable)">
+<subsection name="Apache Tomcat 10.1.x (Stable)">
<p><strong>Apache Tomcat 10.1.x</strong> builds on Tomcat 10.0.x and implements
the <strong>Servlet 6.0</strong>, <strong>JSP 3.1</strong>, <strong>EL
@@ -305,10 +305,10 @@ the <strong>Servlet 6.0</strong>, <stron
3.0</strong> specifications (the versions required by Jakarta EE 10 platform).
</p>
-</section>
+</subsection>
-<section name="Apache Tomcat 9.x (Stable)">
+<subsection name="Apache Tomcat 9.x (Stable)">
<p><strong>Apache Tomcat 9.x</strong> builds on Tomcat 8.0.x and 8.5.x and
implements the <strong>Servlet 4.0</strong>, <strong>JSP 2.3</strong>,
@@ -326,12 +326,35 @@ improvements:
<li>Adds support for TLS virtual hosting (SNI)</li>
</ul>
-</section>
+<p>Tomcat 9 is the last major Tomcat version supporting Java EE. Therefore, the
+Tomcat community intends to provide support for Tomcat 9 beyond the 10 years
for
+which major Tomcat versions are typically supported.</p>
+
+<p>Extended support will be provided via a new 9.1.x branch that will be
started
+when 9.0.x reaches end of support. The APR/Native Connector will not be
+available in Tomcat 9.1.x.</p>
+
+<p>Support for NIO+OpenSSL and NIO2+OpenSSL will continue in Tomcat 9.1.x via
+Tomcat Native 2.x.</p>
+
+<p>Back-ports of security fixes, bug fixes and new features will continue for
+9.1.x as they have done for 9.0.x.</p>
+
+<p>End of support for Tomcat 9.0.x is expected <b>no earlier than</b> 31 March
+2027.</p>
+
+<p>End of support for Tomcat 9.1.x has not been determined. At least 12
+months notice will be provided for 9.1.x end of support.</p>
+</subsection>
+
</section>
<section name="Unsupported Version Details">
<section name="Apache Tomcat 10.0.x (superseded)">
+<p><strong>Apache Tomcat 10.0.x</strong> is available for download from the
+archives.</p>
+
<p><strong>Apache Tomcat 10.0.x</strong> 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
@@ -348,6 +371,9 @@ upgrade to Tomcat 10.1.x or later.</p>
<section name="Apache Tomcat 8.x (archived)">
+<p><strong>Apache Tomcat 8.x</strong> is available for download from the
+archives.</p>
+
<p><strong>Apache Tomcat 8.0.x</strong> builds on Tomcat 7.0.x and implements
the
<strong>Servlet 3.1</strong>, <strong>JSP 2.3</strong>, <strong>EL 3.0</strong>
and <strong>WebSocket 1.1</strong> specifications. In addition
@@ -373,9 +399,7 @@ created at that time, as Java EE specifi
only finalized a few years later).
</p>
-<p>Tomcat 8.5 is thought as a replacement for Tomcat 8.0. Please refer to
-<a href="/migration.html">Migration guide</a> for guidance on migrating to
-Tomcat 8.5.</p>
+<p>Tomcat 8.5 was a replacement for Tomcat 8.0.</p>
<p>
Apache Tomcat 8.5.x includes the following significant improvements:
@@ -396,25 +420,28 @@ Apache Tomcat 8.5.x includes the followi
<li>Support for Comet API</li>
</ul>
-<p>There are significant changes in many areas under the hood, resulting in
+<p>There were significant changes in many areas under the hood, resulting in
improved performance, stability, and total cost of ownership. Please refer
to the Apache Tomcat 8.5 Changelog for details.
</p>
<p>Users of Tomcat 8.0 should be aware that Tomcat 8.0 has now reached
<a href="tomcat-80-eol.html">end of life</a>. Users of Tomcat 8.0.x should
-upgrade to Tomcat 8.5.x or later.</p>
+upgrade to Tomcat 9.x or later.</p>
<p>Users of Tomcat 8.5 should be aware that Tomcat 8.5 has now reached
<a href="tomcat-85-eol.html">end of life</a>. Users of Tomcat 8.5.x should
-upgrade to Tomcat 9.0.x or later.</p>
+upgrade to Tomcat 9.x or later.</p>
</section>
<section name="Apache Tomcat 7.x (archived)">
-<p><strong>Apache Tomcat 7.x</strong> builds upon the improvements made in
+<p><strong>Apache Tomcat 7.x</strong> is available for download from the
+archives.</p>
+
+<p><strong>Apache Tomcat 7.x</strong> built upon the improvements made in
Tomcat 6.0.x and implements the <strong>Servlet 3.0</strong>,
<strong>JSP 2.2</strong>, <strong>EL 2.2</strong> and
<strong>WebSocket 1.1</strong> specifications. In addition
@@ -430,13 +457,16 @@ to that, it includes the following impro
<p>Users of Tomcat 7 should be aware that Tomcat 7 has now reached
<a href="tomcat-70-eol.html">end of life</a>. Users of Tomcat 7.x should
upgrade
-to Tomcat 8.5.x or later.</p>
+to Tomcat 9.x or later.</p>
</section>
<section name="Apache Tomcat 6.x (archived)">
+<p><strong>Apache Tomcat 6.x</strong> is available for download from the
+archives.</p>
+
<p><strong>Apache Tomcat 6.x</strong> builds upon the improvements made in
Tomcat 5.5.x and implements the <strong>Servlet 2.5</strong> and
<strong>JSP 2.1</strong> specifications. In addition to that, it includes the
@@ -450,7 +480,7 @@ following improvements:
<p>Users of Tomcat 6 should be aware that Tomcat 6 has now reached
<a href="tomcat-60-eol.html">end of life</a>. Users of Tomcat 6.x should
-upgrade to Tomcat 7.x or later.</p>
+upgrade to Tomcat 9.x or later.</p>
</section>
@@ -486,7 +516,7 @@ it in production</li>
<p>Users of Tomcat 5 should be aware that Tomcat 5 has now reached
<a href="tomcat-55-eol.html">end of life</a>. Users of Tomcat 5.x should
-upgrade to Tomcat 7.x or later.</p>
+upgrade to Tomcat 9.x or later.</p>
</section>
@@ -523,7 +553,7 @@ also supports web applications built for
specifications with no changes.</p>
<p>Users of Tomcat 4 should be aware that Tomcat 4 has now reached
-end of life. Users of Tomcat 4.x should upgrade to Tomcat 7.x or
+end of life. Users of Tomcat 4.x should upgrade to Tomcat 9.x or
later.</p>
</section>
@@ -533,16 +563,6 @@ later.</p>
<p><strong>Apache Tomcat 3.x</strong> is available for download from the
archives.</p>
-<ul>
-<li>Version <strong>3.3</strong> is the current production quality release for
-the Servlet 2.2 and JSP 1.1 specifications. Apache Tomcat 3.3 is the latest
-continuation of the Apache Tomcat 3.x architecture; it is more advanced then
3.2.4,
-which is the 'old' production quality release.</li>
-<li>Version 3.2.4 is the 'old' production quality release and is now in
-maintenance only mode.</li>
-<li>Version 3.1.1 is a legacy release.</li>
-</ul>
-
<p>
All <strong>Apache Tomcat 3.x</strong> releases trace their heritage back to
the
original Servlet and JSP implementations that Sun donated to the Apache
@@ -550,36 +570,27 @@ Software Foundation. The 3.x versions a
2.2</strong> and <strong>JSP 1.1</strong> specifications.
</p>
-<p><strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 is the current
production
-quality release. It continues the refactoring that was begun in version 3.2 and
-carries it to its logical conclusion. Version 3.3 provides a much more modular
-design and allows the servlet container to be customized by adding and removing
-modules that control the processing of servlet requests. This version also
-contains many performance improvements.</p>
+<p><strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 was the final production
+quality release. It continued the refactoring that was begun in version 3.2 and
+carried it to its logical conclusion. Version 3.3 provided a much more modular
+design and allowed the servlet container to be customized by adding and
removing
+modules that controlled the processing of servlet requests. This version also
+contained many performance improvements.</p>
<p><strong>Apache Tomcat 3.2.x</strong>. Version 3.2 added few new features
since 3.1; the major effort was a refactoring of the internals to improve
-performance and stability. The 3.2.1 release, like 3.1.1, was a security
-patch. Version 3.2.2 fixed a large number of bugs and all known
-specification compliance issues. Version 3.2.3 was a security update that
-closes a serious security hole. Version 3.2.4 is a minor bug fix release.
-All users of Apache Tomcat versions prior to 3.2.3 should upgrade as soon as
-possible. With the exception of fixes for critical security related bugs,
-development on the Apache Tomcat 3.2.x branch has stopped.</p>
+performance and stability.</p>
<p><strong>Apache Tomcat 3.1.x</strong>. The 3.1 release contained several
improvements over Apache Tomcat 3.0, including servlet reloading, WAR file
support and added connectors for the IIS and Netscape web servers. The
-latest maintenance release, 3.1.1, contained fixes for security problems.
-There is no active development ongoing for Apache Tomcat 3.1.x. Users of
Apache Tomcat
-3.1 should update to 3.1.1 to close the security holes and they are
-strongly encouraged to migrate to the current production release, Apache Tomcat
-3.3.</p>
+last maintenance release, 3.1.1, contained fixes for security problems.
+</p>
<p><strong>Apache Tomcat 3.0.x</strong>. Initial Apache Tomcat release.</p>
<p>Users of Tomcat 3 should be aware that Tomcat 3 has now reached
-end of life. Users of Tomcat 3.x should upgrade to Tomcat 7.x or
+end of life. Users of Tomcat 3.x should upgrade to Tomcat 9.x or
later.</p>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
