Repository: hadoop Updated Branches: refs/heads/branch-2.6 eedbd033d -> 22095d7a7
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/22095d7a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/22095d7a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/22095d7a Branch: refs/heads/branch-2.6 Commit: 22095d7a72e8fe52950589ebb58893762bc30ea4 Parents: eedbd03 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:38:51 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/22095d7a/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 ea39ebb..ae27e38 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -15,6 +15,9 @@ Release 2.6.3 - UNRELEASED HADOOP-12230. hadoop-project declares duplicate, conflicting curator dependencies. (Rakesh R via aajisaka) + HADOOP-9242. Duplicate surefire plugin config in hadoop-common. + (Andrey Klochkov via suresh) + Release 2.6.2 - 2015-10-21 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/22095d7a/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 0beb11a..529d399 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -408,6 +408,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> @@ -513,18 +519,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>