Author: jing9
Date: Tue Jan 14 02:31:16 2014
New Revision: 1557908
URL: http://svn.apache.org/r1557908
Log:
Merging r1557221 through r1557907 from trunk.
Modified:
hadoop/common/branches/HDFS-5698/ (props changed)
hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml
Propchange: hadoop/common/branches/HDFS-5698/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1557221-1557907
Modified: hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml?rev=1557908&r1=1557907&r2=1557908&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml Tue Jan 14 02:31:16
2014
@@ -760,7 +760,28 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>1.3.9</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.grizzly</groupId>
+ <artifactId>grizzly-http-servlet</artifactId>
+ <version>2.1.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
