Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update zookeeper dependency to import from LinkedIn published version #917

Merged
merged 3 commits into from
Nov 30, 2022
Merged

Update zookeeper dependency to import from LinkedIn published version #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d7decd
Update zookeeper dependency to import from LinkedIn published version
surajkn Nov 15, 2022
ccd4f7a
Excluding zookeeper dependency from org.apache.zookeeper
surajkn Nov 17, 2022
4d0b312
Merge branch 'master' into zk-change
surajkn Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ allprojects {
maven {
url "https://linkedin.jfrog.io/artifactory/open-source"
}
maven {
url "https://linkedin.jfrog.io/artifactory/zookeeper"
}
mavenLocal()
}
}
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependency-versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion gradle/maven.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
allprojects {
version = "4.2.0-SNAPSHOT"
version = "5.0.0-SNAPSHOT"
}

subprojects {
Expand Down