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 sz...@apache.org on 2011/09/01 00:47:53 UTC

svn commit: r1163856 - in /hadoop/common/branches/branch-0.23: ./ hadoop-project/pom.xml

Author: szetszwo
Date: Wed Aug 31 22:47:51 2011
New Revision: 1163856

URL: http://svn.apache.org/viewvc?rev=1163856&view=rev
Log:
svn merge -c 1163852 from trunk for HADOOP-7579.  Contributed by Alejandro Abdelnur

Modified:
    hadoop/common/branches/branch-0.23/   (props changed)
    hadoop/common/branches/branch-0.23/hadoop-project/pom.xml

Propchange: hadoop/common/branches/branch-0.23/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 22:47:51 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852

Modified: hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/pom.xml?rev=1163856&r1=1163855&r2=1163856&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/pom.xml Wed Aug 31 22:47:51 2011
@@ -108,7 +108,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-alfredo</artifactId>
+        <artifactId>hadoop-auth</artifactId>
         <version>${project.version}</version>
       </dependency>
 
@@ -485,6 +485,11 @@
           <artifactId>maven-project-info-reports-plugin</artifactId>
           <version>2.4</version>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.2</version>
+        </plugin>
       </plugins>
     </pluginManagement>