Author: arp Date: Thu Nov 7 17:58:22 2013 New Revision: 1539737 URL: http://svn.apache.org/r1539737 Log: Merging r1539245 through r1539736 from trunk to branch HDFS-2832
Modified: hadoop/common/branches/HDFS-2832/ (props changed) hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml Propchange: hadoop/common/branches/HDFS-2832/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1539245-1539736 Modified: hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml?rev=1539737&r1=1539736&r2=1539737&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml (original) +++ hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml Thu Nov 7 17:58:22 2013 @@ -348,6 +348,11 @@ <version>4.2.5</version> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.2.5</version> + </dependency> + <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.4</version> @@ -554,7 +559,7 @@ <dependency> <groupId>net.java.dev.jets3t</groupId> <artifactId>jets3t</artifactId> - <version>0.6.1</version> + <version>0.9.0</version> </dependency> <dependency> <groupId>org.apache.mina</groupId>