Author: cnauroth
Date: Tue Jun 10 18:05:22 2014
New Revision: 1601713
URL: http://svn.apache.org/r1601713
Log:
HADOOP-9555. Merging change r1601709 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1601713&r1=1601712&r2=1601713&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Tue Jun 10 18:05:22
2014
@@ -65,6 +65,8 @@
<!-- define the protobuf JAR version -->
<protobuf.version>2.5.0</protobuf.version>
<protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
+
+ <zookeeper.version>3.4.6</zookeeper.version>
</properties>
<dependencyManagement>
@@ -691,7 +693,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.5</version>
+ <version>${zookeeper.version}</version>
<exclusions>
<exclusion>
<!-- otherwise seems to drag in junit 3.8.1 via jline -->
@@ -715,7 +717,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.5</version>
+ <version>${zookeeper.version}</version>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
