Author: szetszwo
Date: Wed Aug 31 23:01:16 2011
New Revision: 1163860
URL: http://svn.apache.org/viewvc?rev=1163860&view=rev
Log:
svn merge -c 1163858 from trunk.
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 23:01:16 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858
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=1163860&r1=1163859&r2=1163860&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
23:01:16 2011
@@ -168,6 +168,28 @@
<artifactId>jetty-util</artifactId>
<version>6.1.26</version>
</dependency>
+
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ <version>1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>1.8</version>
+ </dependency>
+
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
