Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-3199. Fixed pom files to include correct log4j configuration for tests. (vinodkv) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1185967 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2011-10-19 04:30:27 +00:00
parent d0a301e9f8
commit 3e3abcb769
18 changed files with 33 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -1674,6 +1674,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3203. Fix some javac warnings in MRAppMaster. (mahadev)
MAPREDUCE-3199. Fixed pom files to include correct log4j configuration for
tests. (vinodkv)
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES

3
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
View File

@ -26,7 +26,8 @@
<properties>
<applink.base>${project.build.directory}/${project.name}</applink.base>
<mr.basedir>${project.parent.parent.basedir}</mr.basedir>
<!-- Needed for generating FindBugs warnings using parent pom -->
<mr.basedir>${project.parent.basedir}/../</mr.basedir>
</properties>
<dependencies>

3
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
View File

@ -25,7 +25,8 @@
<name>hadoop-mapreduce-client-common</name>
<properties>
<mr.basedir>${project.parent.parent.basedir}</mr.basedir>
<!-- Needed for generating FindBugs warnings using parent pom -->
<mr.basedir>${project.parent.basedir}/../</mr.basedir>
</properties>
<dependencies>

10
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
View File

@ -25,6 +25,7 @@
<name>hadoop-mapreduce-client-core</name>
<properties>
<!-- Needed for generating FindBugs warnings using parent pom -->
<mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties>
@ -41,6 +42,15 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<log4j.configuration>file:///${project.parent.basedir}/../src/test/log4j.properties</log4j.configuration>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>

12
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml
View File

@ -25,6 +25,7 @@
<name>hadoop-mapreduce-client-hs</name>
<properties>
<!-- Needed for generating FindBugs warnings using parent pom -->
<mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties>
@ -50,15 +51,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>

3
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
View File

@ -26,7 +26,8 @@
<properties>
<fork.mode>always</fork.mode>
<mr.basedir>${project.parent.parent.basedir}</mr.basedir>
<!-- Needed for generating FindBugs warnings using parent pom -->
<mr.basedir>${project.parent.basedir}/../</mr.basedir>
</properties>
<dependencies>

3
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml
View File

@ -25,7 +25,8 @@
<name>hadoop-mapreduce-client-shuffle</name>
<properties>
<mr.basedir>${project.parent.parent.basedir}</mr.basedir>
<!-- Needed for generating FindBugs warnings using parent pom -->
<mr.basedir>${project.parent.basedir}/../</mr.basedir>
</properties>
<dependencies>

3
hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
View File

@ -27,7 +27,8 @@
<packaging>pom</packaging>
<properties>
<mr.basedir>${project.parent.basedir}</mr.basedir>
<!-- Needed for generating FindBugs warnings using parent pom -->
<mr.basedir>../</mr.basedir>
</properties>

1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml
View File

@ -25,6 +25,7 @@
<name>hadoop-yarn-api</name>
<properties>
<!-- Needed for generating FindBugs warnings using parent pom -->
<yarn.basedir>${project.parent.basedir}</yarn.basedir>
</properties>

1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
View File

@ -25,6 +25,7 @@
<name>hadoop-yarn-applications-distributedshell</name>
<properties>
<!-- Needed for generating FindBugs warnings using parent pom -->
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties>

1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml
View File

@ -25,6 +25,7 @@
<name>hadoop-yarn-common</name>
<properties>
<!-- Needed for generating FindBugs warnings using parent pom -->
<yarn.basedir>${project.parent.basedir}</yarn.basedir>
</properties>

1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
View File

@ -25,6 +25,7 @@
<name>hadoop-yarn-server-common</name>
<properties>
<!-- Needed for generating FindBugs warnings using parent pom -->
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties>

1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
View File

@ -25,6 +25,7 @@
<name>hadoop-yarn-server-nodemanager</name>
<properties>
<!-- Basedir eeded for generating FindBugs warnings using parent pom -->
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
<container-executor.conf.dir>/etc/hadoop</container-executor.conf.dir>
</properties>

1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
View File

@ -25,6 +25,7 @@
<name>hadoop-yarn-server-resourcemanager</name>
<properties>
<!-- Needed for generating FindBugs warnings using parent pom -->
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties>

1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
View File

@ -24,6 +24,7 @@
<name>hadoop-yarn-server-tests</name>
<properties>
<!-- Needed for generating FindBugs warnings using parent pom -->
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties>

1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml
View File

@ -25,6 +25,7 @@
<name>hadoop-yarn-site</name>
<properties>
<!-- Needed for generating FindBugs warnings using parent pom -->
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties>

20
hadoop-mapreduce-project/hadoop-yarn/pom.xml
View File

@ -389,26 +389,6 @@
<artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- requires 2.5+ to make system properties work -->
<!-- requires 2.7+ to avoid SUREFIRE-640 -->
<version>2.9</version>
<configuration>
<failIfNoTests>false</failIfNoTests>
<redirectTestOutputToFile>${test.logs}</redirectTestOutputToFile>
<forkedProcessTimeoutInSeconds>${test.timeout}</forkedProcessTimeoutInSeconds>
<environmentVariables>
<JAVA_HOME>${java.home}</JAVA_HOME>
</environmentVariables>
<systemPropertyVariables>
<build.dir>${project.build.directory}</build.dir>
<build.output.dir>${project.build.outputDirectory}</build.output.dir>
<log4j.configuration>file:///${yarn.basedir}/../src/test/log4j.properties</log4j.configuration>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>

21
hadoop-mapreduce-project/pom.xml
View File

@ -194,27 +194,6 @@
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- requires 2.5+ to make system properties work -->
<!-- requires 2.7+ to avoid SUREFIRE-640 -->
<version>2.9</version>
<configuration>
<failIfNoTests>false</failIfNoTests>
<redirectTestOutputToFile>${test.logs}</redirectTestOutputToFile>
<forkedProcessTimeoutInSeconds>${test.timeout}</forkedProcessTimeoutInSeconds>
<forkMode>${fork.mode}</forkMode>
<environmentVariables>
<JAVA_HOME>${java.home}</JAVA_HOME>
</environmentVariables>
<systemPropertyVariables>
<build.dir>${project.build.directory}</build.dir>
<build.output.dir>${project.build.outputDirectory}</build.output.dir>
<log4j.configuration>file:///${mr.basedir}/src/test/log4j.properties</log4j.configuration>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>