Repository: hadoop Updated Branches: refs/heads/branch-2.7 63cd0c8ba -> a4fd068d4
HADOOP-9242. Duplicate surefire plugin config in hadoop-common. Contributed by Andrey Klochkov. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1438213 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 16acd69e587956105897ccff2d4dd4b473aaf8bc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a4fd068d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a4fd068d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a4fd068d Branch: refs/heads/branch-2.7 Commit: a4fd068d46cfb2c4101f361dfa035d6252cbf5a4 Parents: 63cd0c8 Author: Suresh Srinivas <sur...@apache.org> Authored: Thu Jan 24 21:51:34 2013 +0000 Committer: Sangjin Lee <sj...@apache.org> Committed: Fri Oct 30 14:32:38 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-common-project/hadoop-common/pom.xml | 18 ++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4fd068d/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 3d2bf34..ee9e771 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -51,6 +51,9 @@ Release 2.7.2 - UNRELEASED HADOOP-12464. Interrupted client may try to fail-over and retry (kihwal) + HADOOP-9242. Duplicate surefire plugin config in hadoop-common. + (Andrey Klochkov via suresh) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4fd068d/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 cdb2c9f..6446020 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -398,6 +398,12 @@ <kdc.resource.dir>${kdc.resource.dir}</kdc.resource.dir> <runningWithNative>${runningWithNative}</runningWithNative> </systemPropertyVariables> + <properties> + <property> + <name>listener</name> + <value>org.apache.hadoop.test.TimedOutTestsListener</value> + </property> + </properties> </configuration> </plugin> <plugin> @@ -503,18 +509,6 @@ </excludes> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <properties> - <property> - <name>listener</name> - <value>org.apache.hadoop.test.TimedOutTestsListener</value> - </property> - </properties> - </configuration> - </plugin> </plugins> </build>
