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 2013/09/15 06:32:41 UTC
svn commit: r1523402 - in /hadoop/common/branches/HDFS-2832: ./
hadoop-client/pom.xml hadoop-project/pom.xml
Author: szetszwo
Date: Sun Sep 15 04:32:39 2013
New Revision: 1523402
URL: http://svn.apache.org/r1523402
Log:
Merge r1523109 through r1523401 from trunk.
Modified:
hadoop/common/branches/HDFS-2832/ (props changed)
hadoop/common/branches/HDFS-2832/hadoop-client/pom.xml
hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml
Propchange: hadoop/common/branches/HDFS-2832/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1523109-1523401
Modified: hadoop/common/branches/HDFS-2832/hadoop-client/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-client/pom.xml?rev=1523402&r1=1523401&r2=1523402&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-client/pom.xml (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-client/pom.xml Sun Sep 15 04:32:39 2013
@@ -40,10 +40,6 @@
<scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
</exclusion>
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=1523402&r1=1523401&r2=1523402&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml Sun Sep 15 04:32:39 2013
@@ -59,6 +59,9 @@
<hadoop.common.build.dir>${basedir}/../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
<java.security.egd>file:///dev/urandom</java.security.egd>
+ <!-- jersey version -->
+ <jersey.version>1.9</jersey.version>
+
<!-- ProtocolBuffer version, used to verify the protoc version and -->
<!-- define the protobuf JAR version -->
<protobuf.version>2.5.0</protobuf.version>
@@ -365,12 +368,12 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>javax.xml.stream</groupId>
@@ -381,7 +384,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
@@ -399,19 +402,19 @@
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-guice</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-core</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-grizzly2</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>