This is an automated email from the ASF dual-hosted git repository.
psteitz pushed a commit to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
The following commit(s) were added to refs/heads/POOL_2_X by this push:
new 1435eabe Adjust for running log release notes format.
1435eabe is described below
commit 1435eabee15669f1c8dace3ad29dbddd4bff59fb
Author: psteitz <phil.ste...@gmail.com>
AuthorDate: Fri Sep 22 11:57:37 2023 -0700
Adjust for running log release notes format.
---
pool-pre-RC.sh | 32 ++++++++++++++++++++++++--------
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/pool-pre-RC.sh b/pool-pre-RC.sh
index 26b68a81..14c41619 100755
--- a/pool-pre-RC.sh
+++ b/pool-pre-RC.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -19,12 +19,28 @@
# Shell script to update download page and release notes prior
# to preparing a commons pool release candidate.
#
-# Note: RELEASE-NOTES.txt may need a little reformatting prior
-# to checkin. Both RELEASE-NOTES.txt and the generated download
-# page need to be checked in after review.
-#
-# $Revision$ $Date$
+# Notes:
+# 1. RELEASE-NOTES.txt may need a little reformatting prior to commit
+# 2. Both RELEASE-NOTES.txt and the generated download
+# page need to be checked in after review.
# ----------------------------------------------------------------------------
-version=2.4.3
+# Update release notes
+version=2.12.0
+# Pop off any previously generated current release content first.
+first_line=`head -1 RELEASE-NOTES.txt`
+target="Apache Commons Pool $version RELEASE NOTES"
+if [[ $first_line =~ $target ]]
+then
+ echo "Removing previously generated content for $version from
RELEASE-NOTES.txt"
+ sed -i '1,/------------------------------------------------/d'
RELEASE-NOTES.txt
+fi
+# Make a copy of previous release notes to prepend the new release notes to
+cp RELEASE-NOTES.txt RELEASE-NOTES.txt.orig
+# Generate new release notes - only generates new content and replaces
RELEASE-NOTES.txt with new content
mvn changes:announcement-generate -Prelease-notes -Dchanges.version=${version}
-mvn commons:download-page -Dcommons.componentid=pool
-Dcommons.release.version=${version}
+# Put Humpty back together again
+cat RELEASE-NOTES.txt RELEASE-NOTES.txt.orig > RELEASE-NOTES.txt.new
+mv RELEASE-NOTES.txt.new RELEASE-NOTES.txt
+rm RELEASE-NOTES.txt.orig
+# Generate the download page
+mvn commons-build:download-page -Dcommons.componentid=pool
-Dcommons.release.version=${version}
