You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bo...@apache.org on 2012/05/01 20:53:09 UTC
svn commit: r1332776 - in /hadoop/common/branches/branch-2:
hadoop-project/pom.xml pom.xml
Author: bobby
Date: Tue May 1 18:53:08 2012
New Revision: 1332776
URL: http://svn.apache.org/viewvc?rev=1332776&view=rev
Log:
svn merge -c 1332775 FIXES: HADOOP-8317. Update maven-assembly-plugin to 2.3 - fix build on FreeBSD (Radim Kolar via bobby)
Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml
hadoop/common/branches/branch-2/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=1332776&r1=1332775&r2=1332776&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Tue May 1 18:53:08 2012
@@ -684,11 +684,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
</plugin>
Modified: hadoop/common/branches/branch-2/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/pom.xml?rev=1332776&r1=1332775&r2=1332776&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/pom.xml (original)
+++ hadoop/common/branches/branch-2/pom.xml Tue May 1 18:53:08 2012
@@ -103,6 +103,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
</plugin>