You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/29 17:42:59 UTC
svn commit: r1873321 - in /tomcat/site/trunk: docs/source.html
xdocs/source.xml
Author: markt
Date: Wed Jan 29 17:42:59 2020
New Revision: 1873321
URL: http://svn.apache.org/viewvc?rev=1873321&view=rev
Log:
Update source info with new(ish) 9.0.x branch
Modified:
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/xdocs/source.xml
Modified: tomcat/site/trunk/docs/source.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1873321&r1=1873320&r2=1873321&view=diff
==============================================================================
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Wed Jan 29 17:42:59 2020
@@ -304,25 +304,30 @@ found at git.apache.org or GitHub and ar
<p>This the Git repository that contains the Apache Tomcat source code. There
-are currently three branches:</p>
+are currently four branches:</p>
<ul>
<li>master</li>
+<li>9.0.x</li>
+
<li>8.5.x</li>
<li>7.0.x</li>
</ul>
-<p>master is the primary development branch. Apache Tomcat 9.0.x releases are
+<p>master is the primary development branch. Apache Tomcat 10.0.0.x releases are
tagged from this branch. Development work generally occurs in this branch
first.</p>
-<p>8.5.x is the stable release branch for Apache Tomcat 8.5.x. Generally, fixes
+<p>9.0.x is the stable release branch for Apache Tomcat 9.0.x. Generally, fixes
are cherry picked from master 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>
+
<p>7.0.x is the stable release branch for Apache Tomcat 7.0.x. Generally, fixes
are cherry picked from 8.5.x into this branch.</p>
Modified: tomcat/site/trunk/xdocs/source.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/source.xml?rev=1873321&r1=1873320&r2=1873321&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/source.xml (original)
+++ tomcat/site/trunk/xdocs/source.xml Wed Jan 29 17:42:59 2020
@@ -49,17 +49,20 @@ found at git.apache.org or GitHub and ar
<section name="tomcat.git">
<p>This the Git repository that contains the Apache Tomcat source code. There
-are currently three branches:</p>
+are currently four branches:</p>
<ul>
<li>master</li>
+<li>9.0.x</li>
<li>8.5.x</li>
<li>7.0.x</li>
</ul>
-<p>master is the primary development branch. Apache Tomcat 9.0.x releases are
+<p>master is the primary development branch. Apache Tomcat 10.0.0.x releases are
tagged from this branch. Development work generally occurs in this branch
first.</p>
-<p>8.5.x is the stable release branch for Apache Tomcat 8.5.x. Generally, fixes
+<p>9.0.x is the stable release branch for Apache Tomcat 9.0.x. Generally, fixes
are cherry picked from master 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>
<p>7.0.x is the stable release branch for Apache Tomcat 7.0.x. Generally, fixes
are cherry picked from 8.5.x into this branch.</p>
<p>A web based view of this repository is available via
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org