This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hadoop-release-support.git
commit a2996a617ea39c59d4bb6d3b89361d732bac6b36
Author: Steve Loughran <ste...@cloudera.com>
AuthorDate: Mon Aug 8 18:06:48 2022 +0100
HADOOP-18305. 3.3.4 release work
---
build.xml | 22 ++++++++++++++++------
src/text/announcement.txt | 4 ++--
src/text/user-email-announcement.txt | 10 ++++++++++
3 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/build.xml b/build.xml
index 206e50b..a8f8103 100644
--- a/build.xml
+++ b/build.xml
@@ -720,9 +720,6 @@ Message is in file ${message.out}
description="build site announcement"
depends="release.site.prepare">
- <require-dir dir="${hadoop.site.dir}"/>
- <property name="hadoop.site.content.docs"
- location="${hadoop.site.dir}/content/docs/"/>
<tstamp>
<format property="timestamp" pattern="yyyy-MM-dd" />
@@ -739,15 +736,28 @@ Message is in file ${message.out}
<echo>${announcement.txt}</echo>
<echo file="${announcement.out}">${announcement.txt}</echo>
+ <loadfile property="user-email-announcement.txt"
+ srcFile="src/text/user-email-announcement.txt">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+ <property name="user-email-announcement.out"
+ location="${target}/user-email-announcement.txt"/>
- <copy file="${announcement.out}"
- tofile="${hadoop.site.dir}/src/release/${ver}.md" />
+ <echo>${user-email-announcement.txt}</echo>
+ <echo
file="${user-email-announcement.out}">${user-email-announcement.txt}</echo>
+
</target>
<target name="release.site.docs"
- depends="release.site.prepare"
+ depends="release.site.prepare, release.site.announcement"
description="release the site docs by copying them">
<echo>copying site docs to ${hadoop.site.content.dest}</echo>
+
+ <copy file="${announcement.out}"
+ tofile="${hadoop.site.dir}/src/release/${ver}.md" />
+
<delete dir="${hadoop.site.content.dest}"/>
<copy todir="${hadoop.site.content.dest}"
includeemptydirs="true">
diff --git a/src/text/announcement.txt b/src/text/announcement.txt
index f284477..db79deb 100644
--- a/src/text/announcement.txt
+++ b/src/text/announcement.txt
@@ -19,7 +19,7 @@ linked: true
This is a release of Apache Hadoop ${release.branch} line.
-It contains a small number security and critical integration fixes since
${previous.ver}.
+It contains a small number of security and critical integration fixes since
${previous.ver}.
Users of Apache Hadoop ${previous.ver} should upgrade to this release.
@@ -32,6 +32,6 @@ Users are encouraged to read the [overview of major
changes][1] since release ${
For details of bug fixes, improvements, and other enhancements since the
previous ${previous.ver} release,
please check [release notes][2] and [changelog][3].
-[1]: /docs/r${ver}/index.html
+[1]: http://hadoop.apache.org/docs/r${ver}/index.html
[2]:
http://hadoop.apache.org/docs/r${ver}/hadoop-project-dist/hadoop-common/release/${ver}/RELEASENOTES.${ver}.html
[3]:
http://hadoop.apache.org/docs/r${ver}/hadoop-project-dist/hadoop-common/release/${ver}/CHANGELOG.${ver}.html
diff --git a/src/text/user-email-announcement.txt
b/src/text/user-email-announcement.txt
new file mode 100644
index 0000000..535779c
--- /dev/null
+++ b/src/text/user-email-announcement.txt
@@ -0,0 +1,10 @@
+[ANNOUNCE] Apache Hadoop ${ver} release
+
+On behalf of the Apache Hadoop Project Management Committee, I am
+pleased to announce the release of Apache Hadoop ${ver}.
+
+${announcement.txt}
+
+Many thanks to everyone who helped in this release by supplying patches,
+reviewing them, helping get this release building and testing and
+reviewing the final artifacts.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
