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 8d97fe8a9fb68e726197912afa2e2b56c8335856
Author: Steve Loughran <ste...@cloudera.com>
AuthorDate: Mon Aug 8 15:51:38 2022 +0100
HADOOP-18305. 3.3.4 release work
---
README.md | 28 +++++++++
build.xml | 151 +++++++++++++++++++++++++++++++++++++++++++++-
src/text/announcement.txt | 37 ++++++++++++
src/{ => text}/email.txt | 0
4 files changed, 213 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 098f226..ce9bda0 100644
--- a/README.md
+++ b/README.md
@@ -266,3 +266,31 @@ ant cloud-examples.test
ant hboss.build
```
+## building the site
+
+set `hadoop.site.dir` to be the path to where the git
+clone of the asf site repo is
+
+```properties
+hadoop.site.dir=/Users/stevel/hadoop/release/hadoop-site\
+ ```
+
+prepare the site with the following targets
+
+```bash
+ant release.site.announcement
+ant release.site.docs
+```
+
+review the annoucement.
+
+In the
+
+```bash
+rm current3
+ln -s r.3.3.4 current3
+ls -l
+rm stable3
+ln -s r3.3.4 stable
+ln -s r3.3.4 stable3
+```
diff --git a/build.xml b/build.xml
index 3683742..206e50b 100644
--- a/build.xml
+++ b/build.xml
@@ -41,16 +41,20 @@
<property file="build.properties"/>
- <property name="rc" value="RC0"/>
<property name="dist.dir" location="${target}/dist"/>
<property name="incoming.dir" location="${target}/incoming"/>
- <!-- base name of a release, 3.3.4-RC0 -->
+ <!-- base name of a release, 3.3.4-->
<property name="hadoop.version" value="3.3.4"/>
+ <property name="rc" value="RC0"/>
<property name="rc.name" value="${hadoop.version}-${rc}"/>
+ <!-- previous version, used in annoucements -->
+ <property name="previous.ver" value="3.3.3"/>
+ <property name="release.branch" value="3.3"/>
+
<!-- for spark builds -->
<property name="spark.version" value="3.4.0-SNAPSHOT"/>
<!-- spark excludes hadoop-aws dependency and forces in their own
@@ -70,6 +74,8 @@
value=""/>-->
<property name="release.untar.dir" location="${target}/untar"/>
<property name="release.source.dir" location="${release.untar.dir}/source"/>
+ <property name="release.site.dir" location="${release.untar.dir}/site"/>
+ <property name="site.dir"
location="${release.untar.dir}/site/r${hadoop.version}"/>
<property name="release.bin.dir" location="${release.untar.dir}/bin"/>
<property name="release.native.binaries" value="true"/>
@@ -120,6 +126,9 @@
<property name="scp.source"
value="${scp.user}@${scp.hostname}:${scp.hadoop.dir}/target/artifacts"/>
+ <property name="site.dir"
+ value="${release.source.dir}/${release}-src"/>
+
<echo>
hadoop.version=${hadoop.version}
rc=${rc}
@@ -320,7 +329,7 @@
</fail>
<loadfile property="message.txt"
- srcFile="src/email.txt">
+ srcFile="src/text/email.txt">
<filterchain>
<expandproperties/>
</filterchain>
@@ -531,6 +540,15 @@ Message is in file ${message.out}
tofile="${release.dir}"/>
</target>
+ <target name="release.site.untar" depends="release.dir.check"
+ description="untar the release site">
+ <echo>untarring site ${release.dir}/${release}-site.tar.gz</echo>
+ <mkdir dir="target/untar"/>
+
+ <gunzip src="${release.dir}/${release}-site.tar.gz" dest="target/untar"/>
+ <untar src="target/untar/${release}-site.tar" dest="${release.site.dir}" />
+ </target>
+
<target name="release.src.untar" depends="release.dir.check"
description="untar the release source">
<echo>untarring source ${release.dir}/${release}-src.tar.gz</echo>
@@ -612,4 +630,131 @@ Message is in file ${message.out}
</hadoopq>
</target>
+
+ <target name="release.copy.init" depends="release.dir.check" >
+ <!-- destination dir-->
+ <require-dir dir="${hadoop.source.dir}"/>
+ <property name="ver" value="${hadoop.version}"/>
+ <require-dir dir="${release.dir}"/>
+ </target>
+
+
+ <target name="release.copy.changelog" depends="release.copy.init"
+ description="copy changelog and release">
+ <!-- destination dir-->
+ <require-dir dir="${hadoop.source.dir}"/>
+ <echo>
+ copying release notes to ${hadoop.source.dir}.
+ Check out the target branch for the updates first.
+ </echo>
+ <property name="release.notes.dir"
+
location="${hadoop.source.dir}/hadoop-common-project/hadoop-common/src/site/markdown/release/${ver}"/>
+ <mkdir dir="${release.notes.dir}"/>
+ <copy file="${release.dir}/RELEASENOTES.md"
+ tofile="${release.notes.dir}/RELEASENOTES.${ver}.md"/>
+ <copy file="${release.dir}/CHANGELOG.md"
+ tofile="${release.notes.dir}/CHANGELOG.${ver}.md"/>
+ </target>
+
+ <target name="release.copy.jdiff" depends="release.copy.init"
+ description="copy jdiff">
+ <!-- destination dir-->
+ <require-dir dir="${hadoop.source.dir}"/>
+ <echo>
+ copying jdiff files to ${hadoop.source.dir}.
+ Check out the target branch for the updates first.
+ </echo>
+ <!-- find target/untar -name "Apache_Hadoop_*_$ver.xml" -->
+ <x executable="find" dir="${site.dir}" >
+ <arg value="." />
+ <arg value="-name" />
+ <arg value="Apache_Hadoop_*_${ver}.xml" />
+ </x>
+
+ <property name="yarn.jdiff.dest"
+
location="${hadoop.source.dir}/hadoop-yarn-project/hadoop-yarn/dev-support/jdiff"/>
+
+ <copy todir="${yarn.jdiff.dest}" >
+ <fileset
file="${site.dir}/hadoop-yarn/hadoop-yarn-api/jdiff/xml/Apache_Hadoop_YARN_API_${ver}.xml"/>
+ <fileset
file="${site.dir}/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/jdiff/xml/Apache_Hadoop_YARN_Server_Common_${ver}.xml"/>
+ <fileset
file="${site.dir}/hadoop-yarn/hadoop-yarn-common/jdiff/xml/Apache_Hadoop_YARN_Common_${ver}.xml"/>
+ <fileset
file="${site.dir}/hadoop-yarn/hadoop-yarn-client/jdiff/xml/Apache_Hadoop_YARN_Client_${ver}.xml"/>
+ </copy>
+
+ <copy
+
file="${site.dir}/hadoop-project-dist/hadoop-common/jdiff/xml/Apache_Hadoop_Common_${ver}.xml"
+
todir="${hadoop.source.dir}/hadoop-common-project/hadoop-common/dev-support/jdiff/"/>
+
+ <copy
+
file="${site.dir}/hadoop-project-dist/hadoop-hdfs/jdiff/xml/Apache_Hadoop_HDFS_${ver}.xml"
+
todir="${hadoop.source.dir}/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/"/>
+
+
+ <copy
todir="${hadoop.source.dir}/hadoop-mapreduce-project/dev-support/jdiff/">
+ <fileset
file="${site.dir}/hadoop-mapreduce-client/hadoop-mapreduce-client-common/jdiff/xml/Apache_Hadoop_MapReduce_Common_${ver}.xml"/>
+ <fileset
file="${site.dir}/hadoop-mapreduce-client/hadoop-mapreduce-client-core/jdiff/xml/Apache_Hadoop_MapReduce_Core_${ver}.xml"/>
+ <fileset
file="${site.dir}/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/jdiff/xml/Apache_Hadoop_MapReduce_JobClient_${ver}.xml"/>
+ </copy>
+
+
+
+ </target>
+
+ <target name="release.site.prepare"
+ depends="release.copy.init">
+
+ <require-dir dir="${hadoop.site.dir}"/>
+ <property name="hadoop.site.content.docs"
+ location="${hadoop.site.dir}/content/docs/"/>
+
+ <property name="hadoop.site.content.dest"
+ location="${hadoop.site.content.docs}/r${ver}"/>
+
+
+ <tstamp>
+ <format property="timestamp" pattern="yyyy-MM-dd" />
+ </tstamp>
+ </target>
+
+ <target name="release.site.announcement"
+ 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" />
+ </tstamp>
+
+ <loadfile property="announcement.txt"
+ srcFile="src/text/announcement.txt">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+ <property name="announcement.out"
+ location="${target}/announcement.txt"/>
+
+ <echo>${announcement.txt}</echo>
+ <echo file="${announcement.out}">${announcement.txt}</echo>
+
+ <copy file="${announcement.out}"
+ tofile="${hadoop.site.dir}/src/release/${ver}.md" />
+ </target>
+
+ <target name="release.site.docs"
+ depends="release.site.prepare"
+ description="release the site docs by copying them">
+ <echo>copying site docs to ${hadoop.site.content.dest}</echo>
+ <delete dir="${hadoop.site.content.dest}"/>
+ <copy todir="${hadoop.site.content.dest}"
+ includeemptydirs="true">
+ <fileset dir="${site.dir}"/>
+ </copy>
+
+ </target>
+
+
</project>
diff --git a/src/text/announcement.txt b/src/text/announcement.txt
new file mode 100644
index 0000000..f284477
--- /dev/null
+++ b/src/text/announcement.txt
@@ -0,0 +1,37 @@
+---
+title: Release ${ver} available
+date: ${timestamp}
+linked: true
+---
+<!---
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. See accompanying LICENSE file.
+-->
+
+This is a release of Apache Hadoop ${release.branch} line.
+
+It contains a small number security and critical integration fixes since
${previous.ver}.
+
+Users of Apache Hadoop ${previous.ver} should upgrade to this release.
+
+Users of hadoop 2.x and hadoop 3.2 should also upgrade to the 3.3.x line.
+As well as feature enhancements, this is the sole branch currently
+receiving fixes for anything other than critical security/data integrity
+issues.
+
+Users are encouraged to read the [overview of major changes][1] since release
${previous.ver}.
+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
+[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/email.txt b/src/text/email.txt
similarity index 100%
rename from src/email.txt
rename to src/text/email.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
