Author: markt
Date: Tue May 25 08:29:28 2021
New Revision: 1890187
URL: http://svn.apache.org/viewvc?rev=1890187&view=rev
Log:
Update CI and version pages for 10.1.x and fix previous copy/paste
errors/omissions
Modified:
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/ci.xml
tomcat/site/trunk/xdocs/whichversion.xml
Modified: tomcat/site/trunk/docs/ci.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1890187&r1=1890186&r2=1890187&view=diff
==============================================================================
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Tue May 25 08:29:28 2021
@@ -61,12 +61,31 @@ prepared and published by ASF Buildbot,
</td>
</tr>
<tr style="vertical-align:top">
+ <td><strong>tomcat-10.0.x</strong></td>
+ <td>
+ <ul>
+ <li>Source path: <code><a
href="https://github.com/apache/tomcat/tree/10.0.x";>https://github.com/apache/tomcat/tree/10.0.x</a></code></li>
+ <li><a href="https://ci.apache.org/builders/tomcat-10.0.x";>Build status
page</a> for <strong>tomcat-10.0.x</strong><br>This builder is triggered after
each commit. It does a release build and runs tests (using multiple parallel
threads).</li>
+ <li><a
href="https://ci.apache.org/builders/tomcat-10.0.x-periodic";>Build status
page</a> for <strong>tomcat-10.0.x-periodic</strong><br>This builder is
triggered once a day. It runs tests serially and generates a coverage
report.</li>
+ <li><a href="https://ci.apache.org/projects/tomcat/tomcat-10.0.x/";
rel="nofollow">Published files</a>:
+ <ul>
+ <li><a
href="http://ci.apache.org/projects/tomcat/tomcat-10.0.x/docs/index.html";
rel="nofollow">Documentation</a></li>
+ <li><a
href="http://ci.apache.org/projects/tomcat/tomcat-10.0.x/logs/";
rel="nofollow">JUnit logs</a>
+ by revision number. The recent ones are at the bottom.</li>
+ <li><a
href="http://ci.apache.org/projects/tomcat/tomcat-10.0.x/coverage/";
rel="nofollow">Coverage report</a></li>
+ <li><a
href="http://ci.apache.org/projects/tomcat/tomcat-10.0.x/rat-output.html";
rel="nofollow">RAT report</a></li>
+ </ul>
+ </li>
+ </ul>
+ </td>
+</tr>
+<tr style="vertical-align:top">
<td><strong>tomcat-9-trunk</strong></td>
<td>
<ul>
<li>Source path: <code><a
href="https://github.com/apache/tomcat/tree/9.0.x";>https://github.com/apache/tomcat/tree/9.0.x</a></code></li>
- <li><a href="https://ci.apache.org/builders/tomcat-9-trunk";>Build status
page</a> for <strong>tomcat-trunk</strong><br>This builder is triggered after
each commit. It does a release build and runs tests (using multiple parallel
threads).</li>
- <li><a href="https://ci.apache.org/builders/tomcat-9-periodic";>Build
status page</a> for <strong>tomcat-trunk-periodic</strong><br>This builder is
triggered once a day. It runs tests serially and generates a coverage
report.</li>
+ <li><a href="https://ci.apache.org/builders/tomcat-9-trunk";>Build status
page</a> for <strong>tomcat-9-trunk</strong><br>This builder is triggered after
each commit. It does a release build and runs tests (using multiple parallel
threads).</li>
+ <li><a href="https://ci.apache.org/builders/tomcat-9-periodic";>Build
status page</a> for <strong>tomcat-9-trunk-periodic</strong><br>This builder is
triggered once a day. It runs tests serially and generates a coverage
report.</li>
<li><a href="https://ci.apache.org/projects/tomcat/tomcat9/";
rel="nofollow">Published files</a>:
<ul>
<li><a
href="http://ci.apache.org/projects/tomcat/tomcat9/docs/index.html";
rel="nofollow">Documentation</a></li>
Modified: tomcat/site/trunk/docs/whichversion.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1890187&r1=1890186&r2=1890187&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Tue May 25 08:29:28 2021
@@ -24,6 +24,17 @@ specifications</a> and the respective Ap
</tr>
<tr>
+ <td>5.1</td>
+ <td>TBD</td>
+ <td>TBD</td>
+ <td>TBD</td>
+ <td>TBD</td>
+ <td>10.1.x</td>
+ <td>None</td>
+ <td>8 and later</td>
+</tr>
+
+<tr>
<td>5.0</td>
<td>3.0</td>
<td>4.0</td>
@@ -188,23 +199,32 @@ 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">
+</div><h3 id="Apache_Tomcat_10.1.x">Apache Tomcat 10.1.x</h3><div class="text">
+
+<p><strong>Apache Tomcat 10.1.x</strong> is the current focus of development.
It
+builds on Tomcat 10.0.x and implements the <strong>Servlet
+5.1</strong>, <strong>JSP TBD</strong>, <strong>EL TBD</strong>,
<strong>WebSocket TBD
+</strong> and <strong>Authentication TBD</strong> specifications (the versions
required by
+Jakarta EE 10 platform).
+</p>
+
+</div><h3 id="Apache_Tomcat_10.0.x">Apache Tomcat 10.0.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
+<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
+<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
-builds on Tomcat 8.0.x and 8.5.x and implements the <strong>Servlet
-4.0</strong>, <strong>JSP 2.3</strong>, <strong>EL 3.0</strong>,
<strong>WebSocket 1.1
-</strong> and <strong>JASPIC 1.1</strong> specifications (the versions
required by
-Java EE 8 platform). In addition to this, it includes
-the following significant improvements:
+<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>,
+<strong>EL 3.0</strong>, <strong>WebSocket 1.1</strong> and
+<strong>JASPIC 1.1</strong> specifications (the versions required by Java EE 8
+platform). In addition to this, it includes the following significant
+improvements:
</p>
<ul>
<li>Adds support for HTTP/2 (requires either running on Java 9 (since Apache
Tomcat
Modified: tomcat/site/trunk/xdocs/ci.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1890187&r1=1890186&r2=1890187&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/ci.xml (original)
+++ tomcat/site/trunk/xdocs/ci.xml Tue May 25 08:29:28 2021
@@ -73,12 +73,31 @@ prepared and published by ASF Buildbot,
</td>
</tr>
<tr style="vertical-align:top">
+ <td><strong>tomcat-10.0.x</strong></td>
+ <td>
+ <ul>
+ <li>Source path: <code><a
href="https://github.com/apache/tomcat/tree/10.0.x";>https://github.com/apache/tomcat/tree/10.0.x</a></code></li>
+ <li><a href="https://ci.apache.org/builders/tomcat-10.0.x";>Build status
page</a> for <strong>tomcat-10.0.x</strong><br/>This builder is triggered after
each commit. It does a release build and runs tests (using multiple parallel
threads).</li>
+ <li><a
href="https://ci.apache.org/builders/tomcat-10.0.x-periodic";>Build status
page</a> for <strong>tomcat-10.0.x-periodic</strong><br/>This builder is
triggered once a day. It runs tests serially and generates a coverage
report.</li>
+ <li><a href="https://ci.apache.org/projects/tomcat/tomcat-10.0.x/";
rel="nofollow">Published files</a>:
+ <ul>
+ <li><a
href="http://ci.apache.org/projects/tomcat/tomcat-10.0.x/docs/index.html";
rel="nofollow">Documentation</a></li>
+ <li><a
href="http://ci.apache.org/projects/tomcat/tomcat-10.0.x/logs/";
rel="nofollow">JUnit logs</a>
+ by revision number. The recent ones are at the bottom.</li>
+ <li><a
href="http://ci.apache.org/projects/tomcat/tomcat-10.0.x/coverage/";
rel="nofollow">Coverage report</a></li>
+ <li><a
href="http://ci.apache.org/projects/tomcat/tomcat-10.0.x/rat-output.html";
rel="nofollow">RAT report</a></li>
+ </ul>
+ </li>
+ </ul>
+ </td>
+</tr>
+<tr style="vertical-align:top">
<td><strong>tomcat-9-trunk</strong></td>
<td>
<ul>
<li>Source path: <code><a
href="https://github.com/apache/tomcat/tree/9.0.x";>https://github.com/apache/tomcat/tree/9.0.x</a></code></li>
- <li><a href="https://ci.apache.org/builders/tomcat-9-trunk";>Build status
page</a> for <strong>tomcat-trunk</strong><br/>This builder is triggered after
each commit. It does a release build and runs tests (using multiple parallel
threads).</li>
- <li><a href="https://ci.apache.org/builders/tomcat-9-periodic";>Build
status page</a> for <strong>tomcat-trunk-periodic</strong><br/>This builder is
triggered once a day. It runs tests serially and generates a coverage
report.</li>
+ <li><a href="https://ci.apache.org/builders/tomcat-9-trunk";>Build status
page</a> for <strong>tomcat-9-trunk</strong><br/>This builder is triggered
after each commit. It does a release build and runs tests (using multiple
parallel threads).</li>
+ <li><a href="https://ci.apache.org/builders/tomcat-9-periodic";>Build
status page</a> for <strong>tomcat-9-trunk-periodic</strong><br/>This builder
is triggered once a day. It runs tests serially and generates a coverage
report.</li>
<li><a href="https://ci.apache.org/projects/tomcat/tomcat9/";
rel="nofollow">Published files</a>:
<ul>
<li><a
href="http://ci.apache.org/projects/tomcat/tomcat9/docs/index.html";
rel="nofollow">Documentation</a></li>
Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1890187&r1=1890186&r2=1890187&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Tue May 25 08:29:28 2021
@@ -33,6 +33,17 @@ specifications</a> and the respective Ap
</tr>
<tr>
+ <td>5.1</td>
+ <td>TBD</td>
+ <td>TBD</td>
+ <td>TBD</td>
+ <td>TBD</td>
+ <td>10.1.x</td>
+ <td>None</td>
+ <td>8 and later</td>
+</tr>
+
+<tr>
<td>5.0</td>
<td>3.0</td>
<td>4.0</td>
@@ -202,12 +213,24 @@ run stably for extended periods of time.
</section>
-<section name="Apache Tomcat 10.x">
+<section name="Apache Tomcat 10.1.x">
+
+<p><strong>Apache Tomcat 10.1.x</strong> is the current focus of development.
It
+builds on Tomcat 10.0.x and implements the <strong>Servlet
+5.1</strong>, <strong>JSP TBD</strong>, <strong>EL TBD</strong>,
<strong>WebSocket TBD
+</strong> and <strong>Authentication TBD</strong> specifications (the versions
required by
+Jakarta EE 10 platform).
+</p>
+
+</section>
+
+
+<section name="Apache Tomcat 10.0.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
+<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
+<strong>Authentication 2.0</strong> specifications (the versions required by
Jakarta EE 9 platform).
</p>
@@ -216,12 +239,12 @@ Jakarta EE 9 platform).
<section name="Apache Tomcat 9.x">
-<p><strong>Apache Tomcat 9.x</strong> is the current focus of development. It
-builds on Tomcat 8.0.x and 8.5.x and implements the <strong>Servlet
-4.0</strong>, <strong>JSP 2.3</strong>, <strong>EL 3.0</strong>,
<strong>WebSocket 1.1
-</strong> and <strong>JASPIC 1.1</strong> specifications (the versions
required by
-Java EE 8 platform). In addition to this, it includes
-the following significant improvements:
+<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>,
+<strong>EL 3.0</strong>, <strong>WebSocket 1.1</strong> and
+<strong>JASPIC 1.1</strong> specifications (the versions required by Java EE 8
+platform). In addition to this, it includes the following significant
+improvements:
</p>
<ul>
<li>Adds support for HTTP/2 (requires either running on Java 9 (since Apache
Tomcat
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
