Author: dsahlberg
Date: Sat May  7 09:52:25 2022
New Revision: 1900649

URL: http://svn.apache.org/viewvc?rev=1900649&view=rev
Log:
Merge from site/staging: 1900404, 1900405, 1900528, 1900532, 1900561, 1900562

Document the revised release policy as discussed on dev@ [1].

* publish/docs/community-guide/releasing.part.html,
  publish/roadmap.html:
  Changes in several sections related to release process, see merged
  revisions for details.

[1] https://lists.apache.org/thread/17v36gol5vltyx3pv9z4wskftq7hn4zb


Modified:
    subversion/site/publish/   (props changed)
    subversion/site/publish/docs/community-guide/releasing.part.html
    subversion/site/publish/roadmap.html   (contents, props changed)

Propchange: subversion/site/publish/
------------------------------------------------------------------------------
  Merged 
/subversion/site/staging:r1900404-1900405,1900528,1900532,1900561-1900562

Modified: subversion/site/publish/docs/community-guide/releasing.part.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/releasing.part.html?rev=1900649&r1=1900648&r2=1900649&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/releasing.part.html (original)
+++ subversion/site/publish/docs/community-guide/releasing.part.html Sat May  7 
09:52:25 2022
@@ -1622,6 +1622,10 @@ using release.py to automate most of the
     <p>Ask someone with appropriate access to add the A.B.x branch to the
        <a href="#backport-merge-bot">backport merge bot</a>.</p>
     </li>
+<li>
+    <p>Decide whether the release would be regular or LTS and record the
+    decision in <tt>lts_release_lines</tt> in 
<tt>tools/dist/release-lines.yaml</tt>
+    for release.py.</p></li>
 </ul>
 
 </div> <!-- creating-branch -->

Modified: subversion/site/publish/roadmap.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/roadmap.html?rev=1900649&r1=1900648&r2=1900649&view=diff
==============================================================================
--- subversion/site/publish/roadmap.html (original)
+++ subversion/site/publish/roadmap.html Sat May  7 09:52:25 2022
@@ -86,41 +86,51 @@
     title="Link to this section">&para;</a>
 </h2>
 
-<p>Subversion plans to make a regular release every 6 months,
-   with a Long-Term Support (LTS) release every 2 years.
-   Regular releases are intended to deliver new features more quickly, while
-   LTS releases are intended to provide stability over longer periods.
+<p>Subversion has two types of releases:
+   <em>regular</em> releases are intended to deliver new features more 
quickly, while
+   <em><acronym title='Long-Term Support'>LTS</acronym></em> releases are 
intended to provide stability over longer periods.
 </p>
 
-<table cellpadding="0" cellspacing="0" class="centered">
-  <tr>
-    <th>type of release</th>
-    <th>emphasis</th>
-    <th>release every</th>
-    <th>support period</th>
-    <th>release numbers</th>
-  </tr>
-  <tr>
-    <td>LTS release</td>
-    <td>stability</td>
-    <td>2 years</td>
-    <td>4 years</td>
-    <td>1.10, 1.14, ...</td>
-  </tr>
-  <tr>
-    <td>regular release</td>
-    <td>features</td>
-    <td>6 months</td>
-    <td>6 months</td>
-    <td>1.11, 1.12, 1.13, ...</td>
-  </tr>
-</table>
+<p>The two types releases differ in their support lifetime:</p>
+
+<ul>
+
+<li><p>Regular releases are supported for <b>six months</b> from the date of
+their initial release.  For instance, 1.11.x was supported until six months
+after the announcement of 1.11.0.  A regular release may be used to get new
+features out sooner without having to support a particular release for an
+extended period of time, to make feature development more appealing, rewarding
+and faster for both the contributors and the users.</p></li>
+
+<li><p>LTS releases are supported for <b>four years</b> from the date of their
+initial release.  For instance, 1.14.x will be supported until four years after
+the announcement of 1.14.0.</p>
+
+<p>LTS releases are supported until <b>three months</b> after the release of
+the next LTS.</p>
+
+<p>The previous two guarantees cumulate: for an LTS release line to be declared
+end-of-life (EOL), it has to <em>both</em> have been first released over four
+years before <em>and</em> have been supported in parallel to a newer LTS
+release line for at least three months.</p>
+
+<p>For instance, assume 1.42.0 is released on 2042-07-01 and 1.42 is declared
+an LTS line.  In this case, 1.42 will be supported at least until 2046-06-30
+(with no ifs, buts, or maybes).  Furthermore, it is expected that a newer LTS
+release (1.43.0, 1.44.0, etc.) will be made before 2046-04-01, leaving three
+months for upgrading installations.  In case no newer LTS release is made
+until, say, 2048-01-01, the lifetime of 1.42 will automatically be extended
+until 2048-03-31.</p>
+
+<p>At any given time there will be at least one supported LTS release. The
+most current LTS release will be supported with general backports and any
+older release(s) will receive high priority fixes.</p></li>
+
+</ul>
 
 <p>During the support period, we commit to providing updates that fix high
 priority issues such as security and data loss or corruption. We may also
-sometimes fix other issues as appropriate to the emphasis of each release.
-If a release takes longer than planned, we will extend the support periods
-of the previous releases accordingly.</p>
+sometimes fix other issues as appropriate to the emphasis of each release.</p>
 
 <p>In this context, "release" means an increment of the minor release
 number, which is the middle number in our three-component system.
@@ -132,36 +142,15 @@ bugfixes have accumulated to warrant it.
 Subversion 2.0, will probably be done much like the minor releases,
 just with more planning around the exact features.<p>
 
+<p>To date, every release since 1.0 has been LTS, with the exception of 1.11,
+1.12, and 1.13 which were regular.</p>
+
 <p>For more information about Subversion's release numbering and
 compatibility policies, see the section entitled
 <a href="/docs/community-guide/releasing.html#release-numbering" >"Release
 numbering, compatibility, and deprecation"</a> in the
 <a href="/docs/community-guide/">Subversion Community Guide</a>.</p>
 
-<div class="h3" id="transition-lts-regular-releases">
-<h3>Transition to LTS and Regular Releases
-  <a class="sectionlink" href="#transition-lts-regular-releases"
-    title="Link to this section">&para;</a>
-</h3>
-
-<p>Summary:
-<ul><li>1.9 and 1.10 are treated as LTS releases</li>
-    <li>1.11 and later follow the time-based release schedule</li>
-    <li>the next LTS release after 1.10 will be 1.14 LTS</li>
-</ul></p>
-
-<p>Subversion 1.0 through 1.10 were released at intervals varying from around 
6 months in early versions to 2.5 years more recently. Each of those releases 
was supported with general backports until the next release and with high 
priority fixes until the next release after that.</p>
-
-<p>We are introducing faster regular releases in order to get new features
-out sooner, to make feature development more appealing, rewarding and faster
-for both the contributors and the users. We are changing to a time-based
-schedule so that administrators and integrators of Subversion software can
-better plan their upgrade cycles, particularly with the LTS schedule.</p>
-
-<p>The LTS support schedule will apply also to 1.10 and 1.9 (the existing 
supported releases), so each will receive support for 4 years from its initial 
release. General enhancements will go into the regular releases and will not be 
backported to 1.10.</p>
-
-</div> <!-- #transition-lts-regular-releases -->
-
 </div> <!-- #release-planning -->
 
 <div class="h2" id="features-most-wanted">

Propchange: subversion/site/publish/roadmap.html
------------------------------------------------------------------------------
  Merged 
/subversion/site/staging/roadmap.html:r1900404-1900405,1900528,1900532,1900561-1900562


Reply via email to