Repository: hadoop Updated Branches: refs/heads/branch-2 dae9f0ef5 -> b8d586fd8
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/b8d586fd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b8d586fd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b8d586fd Branch: refs/heads/branch-2 Commit: b8d586fd8a507fd93fd5d927c848cc62f5ee4752 Parents: dae9f0e 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:27:45 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/b8d586fd/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 88ba535..21e5fbf 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -696,6 +696,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12519. hadoop-azure tests should avoid creating a metrics configuration file in the module root directory. (cnauroth) + HADOOP-9242. Duplicate surefire plugin config in hadoop-common. + (Andrey Klochkov via suresh) + OPTIMIZATIONS HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString() http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8d586fd/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 22d66cf..ccbe0d6 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -403,6 +403,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> @@ -492,18 +498,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>