svn commit: r1933378 - in subversion/trunk/tools/dist: . templates

Author: kotkov
Date: Mon Apr 27 10:45:10 2026
New Revision: 1933378

Log:
In the release.py script, use one single template for the release notes
instead of separate templates for LTS and regular releases.

Starting from Subversion 1.15, our plan is to have a unified release policy
without distinct LTS/regular releases [1].

[1]: https://lists.apache.org/thread/gwkrrmg3qh01zmlb1wvt5vp0r5k9rsrn

* tools/dist/templates/release-notes-lts.ezt: Remove this template.

* tools/dist/templates/release-notes.ezt: Adjust this template to the new
  unified release policy.  Don't mention "regular releases".

* tools/dist/release.py
  (): Don't load the `lts_release_lines` metadata.
  (is_lts): Remove this helper.
  (write_release_notes): Use the unified release notes template.

* tools/dist/release-lines.yaml
  (lts_release_lines): Remove this list.

Deleted:
   subversion/trunk/tools/dist/templates/release-notes-lts.ezt
Modified:
   subversion/trunk/tools/dist/release-lines.yaml
   subversion/trunk/tools/dist/release.py
   subversion/trunk/tools/dist/templates/release-notes.ezt

Modified: subversion/trunk/tools/dist/release-lines.yaml
==============================================================================
--- subversion/trunk/tools/dist/release-lines.yaml	Mon Apr 27 09:20:51 2026	(r1933377)
+++ subversion/trunk/tools/dist/release-lines.yaml	Mon Apr 27 10:45:10 2026	(r1933378)
@@ -26,6 +26,3 @@ tool_versions:
 recommended_release: '1.14'
 # For clean-dist, a whitelist of artifacts to keep, by version.
 supported_release_lines: ['1.14']
-# Long-Term Support (LTS) versions
-lts_release_lines: ['1.10', '1.14']
-

Modified: subversion/trunk/tools/dist/release.py
==============================================================================
--- subversion/trunk/tools/dist/release.py	Mon Apr 27 09:20:51 2026	(r1933377)
+++ subversion/trunk/tools/dist/release.py	Mon Apr 27 10:45:10 2026	(r1933378)
@@ -85,8 +85,6 @@ tool_versions = dist_metadata['tool_vers
 recommended_release = dist_metadata['recommended_release']
 # For clean-dist, a whitelist of artifacts to keep, by version.
 supported_release_lines = frozenset(dist_metadata['supported_release_lines'])
-# Long-Term Support (LTS) versions
-lts_release_lines = frozenset(dist_metadata['lts_release_lines'])
 
 # Some constants
 svn_repos = os.getenv('SVN_RELEASE_SVN_REPOS',
@@ -307,9 +305,6 @@ def run_svnmucc(cmd, verbose=True, dry_r
     run_command(['svnmucc'] + cmd, verbose=verbose, dry_run=dry_run)
 
 #----------------------------------------------------------------------
-def is_lts(version):
-    return version.branch in lts_release_lines
-
 def is_recommended(version):
     return version.branch == recommended_release
 
@@ -675,8 +670,7 @@ def write_release_notes(args):
 
     # Create a skeleton release notes file from template
 
-    template_filename = \
-        'release-notes-lts.ezt' if is_lts(args.version) else 'release-notes.ezt'
+    template_filename = 'release-notes.ezt'
 
     prev_ver = Version('%d.%d.0' % (args.version.major, args.version.minor - 1))
     data = { 'major-minor'          : args.version.branch,

Modified: subversion/trunk/tools/dist/templates/release-notes.ezt
==============================================================================
--- subversion/trunk/tools/dist/templates/release-notes.ezt	Mon Apr 27 09:20:51 2026	(r1933377)
+++ subversion/trunk/tools/dist/templates/release-notes.ezt	Mon Apr 27 10:45:10 2026	(r1933378)
@@ -233,18 +233,6 @@ if they occur.</p>
 </div>  <!- - troubleshooting - ->
 -->
 
-<div class="h2" id="non-lts-release">
-<h2>Subversion [major-minor].x is a Regular Release
-  <a class="sectionlink" href="#non-lts-release"
-    title="Link to this section">&para;</a>
-</h2>
-
-<p>[major-minor] is a regular release, not a Long-Term Support release.
-   See <a href="/docs/release-notes/#supported-versions">Supported Versions</a>
-   and <a href="/roadmap.html#release-planning">How We Plan Releases</a>.</p>
-
-</div>  <!-- non-lts-release -->
-
 <!-- ***************** END CONTENT ****************** -->
 </div> <!-- #site-content -->
 </body>