Author: tucu
Date: Wed Apr 4 20:25:18 2012
New Revision: 1309584
URL: http://svn.apache.org/viewvc?rev=1309584&view=rev
Log:
Merge -r 1309582:1309583 from trunk to branch. FIXES: MAPREDUCE-4097
Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1309584&r1=1309583&r2=1309584&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Wed Apr 4 20:25:18
2012
@@ -687,6 +687,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
+ <configuration>
+ <excludes>
+ <exclude>mrapp-generated-classpath</exclude>
+ </excludes>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -792,6 +797,21 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-classpath</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <outputFile>target/classes/mrapp-generated-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<inherited>false</inherited>
