HDFS-9629. Update the footer of Web UI to show year 2016 (Contributed by Xiao Chen and Vinayakumar B)
(cherry picked from commit ddcd6954d03d3caadc8b69f7b886a3a17c3c9d0c) (cherry picked from commit 8cdfdbf815bf89eee3184ec7cd00e1924c1ea316) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bef53683 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bef53683 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bef53683 Branch: refs/heads/branch-2.7 Commit: bef53683b6779c12a14f9408e5df6f19d104c4f7 Parents: dd11c82 Author: Vinayakumar B <[email protected]> Authored: Thu Feb 4 13:18:26 2016 +0530 Committer: Vinayakumar B <[email protected]> Committed: Thu Feb 4 13:20:27 2016 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ hadoop-hdfs-project/hadoop-hdfs/pom.xml | 4 ++++ .../hadoop-hdfs/src/main/webapps/datanode/index.html | 2 +- .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html | 2 +- .../hadoop-hdfs/src/main/webapps/hdfs/explorer.html | 2 +- .../hadoop-hdfs/src/main/webapps/journal/index.html | 2 +- .../hadoop-hdfs/src/main/webapps/secondary/status.html | 2 +- hadoop-project/pom.xml | 3 +++ 8 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef53683/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 634a58b..1ed6416 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1225,6 +1225,9 @@ Release 2.6.5 - UNRELEASED IMPROVEMENTS + HDFS-9629. Update the footer of Web UI to show year 2016 + (Xiao Chen and Vinayakumar B via vinayakumarb) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef53683/hadoop-hdfs-project/hadoop-hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index fb1f315..2309b22 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -268,6 +268,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <exclude name="**/proto-web.xml"/> </fileset> </copy> + <replace dir="${project.build.directory}/webapps" value="${release-year}"> + <include name="**/*.html"/> + <replacetoken>{release-year-token}</replacetoken> + </replace> </target> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef53683/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html index aeb61c2..a88bc9b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/index.html @@ -47,7 +47,7 @@ <div class="row"> <hr /> - <div class="col-xs-2"><p>Hadoop, 2015.</p></div> + <div class="col-xs-2"><p>Hadoop, {release-year-token}.</p></div> </div> </div> http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef53683/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html index 5a3a309..30fe1c7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html @@ -67,7 +67,7 @@ <div class="row"> <hr /> - <div class="col-xs-2"><p>Hadoop, 2015.</p></div> + <div class="col-xs-2"><p>Hadoop, {release-year-token}.</p></div> </div> </div> http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef53683/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html index 433c75f..6e35b58 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html @@ -99,7 +99,7 @@ <div class="row"> <hr /> - <div class="col-xs-2"><p>Hadoop, 2015.</p></div> + <div class="col-xs-2"><p>Hadoop, {release-year-token}.</p></div> </div> </div> http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef53683/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html index 4d658c4..72ab2cc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html @@ -47,7 +47,7 @@ <div class="row"> <hr /> - <div class="col-xs-2"><p>Hadoop, 2015.</p></div> + <div class="col-xs-2"><p>Hadoop, {release-year-token}.</p></div> </div> </div> http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef53683/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html index 7893a17..9dbff5d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html @@ -53,7 +53,7 @@ <div class="row"> <hr /> - <div class="col-xs-2"><p>Hadoop, 2015.</p></div> + <div class="col-xs-2"><p>Hadoop, {release-year-token}.</p></div> </div> </div> http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef53683/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index ce51d61..e703542 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -30,6 +30,9 @@ <packaging>pom</packaging> <properties> + <!-- Set the Release year during release --> + <release-year>2016</release-year> + <failIfNoTests>false</failIfNoTests> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
