Browse Source

Merge -r 1190139:1190140 from trunk to branch. FIXES: MAPREDUCE-3209

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190676 13f79535-47bb-0310-9956-ffa450edef68
Alejandro Abdelnur 13 years ago
parent
commit
7362f67bcb

+ 1 - 1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

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

+ 1 - 1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

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

+ 16 - 2
hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

@@ -28,7 +28,6 @@
 
 
   <properties>
   <properties>
     <!-- Needed for generating FindBugs warnings using parent pom -->
     <!-- Needed for generating FindBugs warnings using parent pom -->
-    <mr.basedir>../</mr.basedir>
   </properties>
   </properties>
 
 
 
 
@@ -258,7 +257,22 @@
     </dependency>
     </dependency>
 
 
   </dependencies>
   </dependencies>
-
+ 
+  <build>
+    <plugins>
+       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+         <configuration>
+          <findbugsXmlOutput>true</findbugsXmlOutput>
+          <xmlOutput>true</xmlOutput>
+          <excludeFilterFile>${mr.basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
+          <effort>Max</effort>
+       </configuration>
+     </plugin>
+    </plugins>
+  </build>
+ 
   <modules>
   <modules>
     <module>hadoop-mapreduce-client-core</module>
     <module>hadoop-mapreduce-client-core</module>
     <module>hadoop-mapreduce-client-common</module>
     <module>hadoop-mapreduce-client-common</module>