Update zookeeper dependency to import from LinkedIn published version (…

…#917)

* Update zookeeper dependency to import from LinkedIn published version

Changing zookeeper import version and source. Change to importing from
publicly available version published by LinkedIn instead of the version
published from apache. Apache published version does not support pagination
whereas the one published from LinkedIn does.

* Excluding zookeeper dependency from org.apache.zookeeper

Helix dependency transitively pulls zookeeper dependency from org.apache.zookeeper
which conflicts with the zookeeper dependency from com.linkedin.zookeeper that we
introduced for pagination support. We need to exclude this dependency globally.

Updating major version because of zookeeper dependency group change

build.gradle

@@ -24,6 +24,9 @@ allprojects {
     maven {
       url  "https://linkedin.jfrog.io/artifactory/open-source"
     }
+    maven {
+      url  "https://linkedin.jfrog.io/artifactory/zookeeper"
+    }
     mavenLocal()
   }
 }
@@ -122,6 +125,16 @@ subprojects {
     testCompile "org.testng:testng:$testngVersion"
   }
 
+  configurations.all {
+    // Helix client pulls a transitive dependency of zookeeper from
+    // org.apache.zookeeper group. This conflicts with the zookeeper
+    // dependency from com.linkedin.zookeeper, which is required for
+    // zookeeper pagination support.
+    //
+    // Excluding this just from "datastream-testcommon" is not sufficient
+    exclude group: "org.apache.zookeeper", module: "zookeeper"
+  }
+
   jar {
     manifest {
       attributes 'Implementation-Title': 'Datastream'
@@ -160,6 +173,7 @@ project(':datastream-utils') {
   dependencies {
     compile project(':datastream-common')
     compile "org.apache.helix:zookeeper-api:$helixZkclientVersion"
+    compile "com.linkedin.zookeeper:zookeeper:$zookeeperVersion"
     compile "com.google.guava:guava:$guavaVersion"
     testCompile project(":datastream-kafka")
     testCompile project(":datastream-testcommon")
@@ -250,7 +264,7 @@ project(":datastream-testcommon") {
     compile "commons-cli:commons-cli:$commonsCliVersion"
     compile "org.apache.avro:avro:$avroVersion"
     compile "com.google.code.findbugs:findbugs:$findbugsVersion"
-    compile "org.apache.zookeeper:zookeeper:$zookeeperVersion"
+    compile "com.linkedin.zookeeper:zookeeper:$zookeeperVersion"
     compile "com.linkedin.pegasus:restli-server:$pegasusVersion"
     compile "org.testng:testng:$testngVersion"
     compile "com.google.guava:guava:$guavaVersion"

gradle/dependency-versions.gradle

@@ -19,6 +19,6 @@ ext {
     scalaVersion = "2.12"
     slf4jVersion = "1.7.5"
     testngVersion = "7.1.0"
-    zookeeperVersion = "3.6.3"
+    zookeeperVersion = "3.6.3-23"
     helixZkclientVersion = "1.0.2"
 }

gradle/maven.gradle

@@ -1,5 +1,5 @@
 allprojects {
-  version = "4.2.0-SNAPSHOT"
+  version = "5.0.0-SNAPSHOT"
 }
 
 subprojects {