Repository: hadoop Updated Branches: refs/heads/branch-2 5fb61d71b -> 19895a41a refs/heads/trunk 132d909d4 -> 55ed6558b
HADOOP-11743. maven doesn't clean all the site files (Contributed by ramtin) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/55ed6558 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/55ed6558 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/55ed6558 Branch: refs/heads/trunk Commit: 55ed6558bad5d76ce4ebf958fc101a48032a0cd1 Parents: 132d909 Author: Vinayakumar B <[email protected]> Authored: Fri May 22 16:37:38 2015 +0530 Committer: Vinayakumar B <[email protected]> Committed: Fri May 22 16:45:19 2015 +0530 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-common-project/hadoop-common/pom.xml | 3 ++- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 15 +++++++++++++++ .../hadoop-mapreduce-client-core/pom.xml | 15 +++++++++++++++ .../hadoop-yarn/hadoop-yarn-common/pom.xml | 16 +++++++++++++++- .../hadoop-yarn-server-common/pom.xml | 14 ++++++++++++++ 6 files changed, 64 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ed6558/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 9f588b8..bf9d997 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -746,6 +746,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11955. Fix a typo in the cluster setup doc. (Yanjun Wang via aajisaka) + HADOOP-11743. maven doesn't clean all the site files + (ramtin via vinayakumarb) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ed6558/hadoop-common-project/hadoop-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index bb735c2..6f9ecf7 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -942,7 +942,8 @@ <fileset> <directory>src/site/markdown/release</directory> <includes> - <include>${project.version}</include> + <include>${project.version}/</include> + <include>index.md</include> </includes> <followSymlinks>false</followSymlinks> </fileset> http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ed6558/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 c11b963..1edb67d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -395,6 +395,21 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> </excludes> </configuration> </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>src/site/resources</directory> + <includes> + <include>configuration.xsl</include> + <include>hdfs-default.xml</include> + </includes> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ed6558/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml index c524b60..61f3c53 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml @@ -97,6 +97,21 @@ </excludes> </configuration> </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>src/site/resources</directory> + <includes> + <include>configuration.xsl</include> + <include>mapred-default.xml</include> + </includes> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ed6558/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index bbf9d85..602fcd7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -293,7 +293,21 @@ </execution> </executions> </plugin> - + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>src/site/resources</directory> + <includes> + <include>configuration.xsl</include> + <include>yarn-default.xml</include> + </includes> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ed6558/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml index 2823f2c..18040b4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml @@ -149,6 +149,20 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>src/site/resources</directory> + <includes> + <include>configuration.xsl</include> + </includes> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> </plugins> </build> </project>
