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.

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

Remove ZK candidate dep #2361

Merged
merged 2 commits into from
Jan 7, 2020
Merged

Remove ZK candidate dep #2361

merged 2 commits into from
Jan 7, 2020

Conversation

zaharidichev
Copy link
Member

The artifact for com.twitter.common.zookeeper" % "candidate" % "0.0.84" on maven.twttr.com is not present anymore. Therefore we need to cpy the bits that we use from it and have it in our sourcecode.

Fixes #2360
Signed-off-by: Zahari Dichev [email protected]

Signed-off-by: Zahari Dichev <[email protected]>
@@ -0,0 +1,728 @@
// =================================================================================================
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -0,0 +1,518 @@
// =================================================================================================
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -0,0 +1,168 @@
// =================================================================================================
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -13,6 +13,11 @@ object Deps {

def twitterUtil(mod: String) =
"com.twitter" %% s"util-$mod" % "19.5.1"

def twitterCommonUtil = "com.twitter.common" % "util" % "0.0.121"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the goal here is to stop depending on com.twitter.common altogether. I think this means we also need to copy things like com.twitter.common.base.Command into our repo if they haven't already been copied into finagle-serversets

def zkCandidate =
("com.twitter.common.zookeeper" % "candidate" % "0.0.84")
.exclude("com.twitter.common", "util")
def apacheZookeeper = ("org.apache.zookeeper" % "zookeeper" % "3.5.0-alpha")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if we depend on finalge-serversets, we should automatically get this as a transitive dependency.

Signed-off-by: Zahari Dichev <[email protected]>
Copy link
Member

@adleong adleong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 👍

Copy link
Contributor

@cpretzer cpretzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@adleong adleong merged commit 5651f35 into master Jan 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove dependency on zookeeper-candidate
3 participants