Author: schultz Date: Mon Jun 1 16:09:22 2026 New Revision: 1934844 Log: Cleanup
Add Tomcat 11.0.x and remove 8.5.x Remove the Training project details Modified: tomcat/site/trunk/xdocs/source.xml Modified: tomcat/site/trunk/xdocs/source.xml ============================================================================== --- tomcat/site/trunk/xdocs/source.xml Mon Jun 1 16:03:48 2026 (r1934843) +++ tomcat/site/trunk/xdocs/source.xml Mon Jun 1 16:09:22 2026 (r1934844) @@ -23,9 +23,9 @@ Git for version control. The following c <li>Apache Tomcat 8.5.x</li> <li>Apache Tomcat Connectors</li> <li>Apache Tomcat Native</li> -<li>Apache Tomcat migration tool for Jakarta EE</li> <li>Taglibs</li> <li>Tomcat Maven plugin</li> +<li>Apache Tomcat migration tool for Jakarta EE</li> </ul> <p>The following components currently use Subversion as the primary version control system:</p> @@ -49,9 +49,10 @@ found at git.apache.org or GitHub and ar <section name="tomcat.git"> <p>This is the Git repository that contains the Apache Tomcat source code. There -are currently four branches:</p> +are currently five branches:</p> <ul> <li>main</li> +<li>11.0.1</li> <li>10.1.x</li> <li>9.0.x</li> <li>8.5.x</li> @@ -59,12 +60,12 @@ are currently four branches:</p> <p>main is the primary development branch. Apache Tomcat 11.0.x releases are tagged from this branch. Development work generally occurs in this branch first.</p> -<p>10.1.x is the stable release branch for Apache Tomcat 10.1.x. Generally, +<p>11.0.x is the stable release branch for Apache Tomcat 11.0.x. Generally, fixes are cherry picked from main into this branch.</p> +<p>10.1.x is the stable release branch for Apache Tomcat 10.1.x. Generally, +fixes are cherry picked from 11.0.x into this branch.</p> <p>9.0.x is the stable release branch for Apache Tomcat 9.0.x. Generally, fixes -are cherry picked from 10.0.x into this branch.</p> -<p>8.5.x is the stable release branch for Apache Tomcat 8.5.x. Generally, fixes -are cherry picked from 9.0.x into this branch.</p> +are cherry picked from 10.1.x into this branch.</p> <p>A web based view of this repository is available via <a href="https://github.com/apache/tomcat";>GitHub</a>.</p> </section> @@ -97,20 +98,6 @@ first.</p> <a href="https://github.com/apache/tomcat-native";>GitHub</a>.</p> </section> -<section name="tomcat-training.git"> - -<p>This is the Git repository that contains the Apache Tomcat training material -source code. There is currently one active branch:</p> -<ul> -<li>main</li> -</ul> -<p>main is the primary development branch. Apache Tomcat training courses are -tagged from this branch. Development work generally occurs in this branch -first.</p> -<p>A web based view of this repository is available via -<a href="https://github.com/apache/tomcat-training";>GitHub</a>.</p> -</section> - <section name="tomcat-taglibs-parent.git"> <p>This is the Git repository that contains the parent POM for the Apache Tomcat @@ -166,7 +153,7 @@ branch.</p> <section name="tomcat-maven-plugin.git"> <p>This is the The Apache Tomcat Maven Plugin source code and web site. -Libraries. There are currently one active branch:</p> +There are currently one active branch:</p> <ul> <li>trunk</li> </ul> @@ -186,7 +173,7 @@ There are currently one active branch:</ <p>main is the only development branch. All development work occurs in this branch.</p> <p>A web based view of this repository is available via -<a href="https://github.com/apache/tomcat-jakartaee-migration/";>GitHub</a>.</p> +<a href="https://github.com/apache/tomcat-jakartaee-migration";>GitHub</a>.</p> </section> <section name="Subversion Repository"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
