Skip to content

Commit

Permalink
[split] [finagle] fix dependency problem with multiple version of ser…
Browse files Browse the repository at this point in the history
…versets

Motivation:
After my last commit, (and with a empty ivy cache) the sbt doc compilation was broken in finagle-serversets.
I think (not sure) that's because of the version in the ivyXml was different than the one specified in the sbt.

Modification:
- Update all usage of c.t.common.zookeeper.server-set (finagle sbt & util sbt)

Result:
"./sbt +publish-local" is working!

RB_ID=295301
  • Loading branch information
stevegury authored and CI committed Feb 25, 2014
1 parent 8334c9c commit 1d85771
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions project/Build.scala
Expand Up @@ -242,13 +242,13 @@ object Finagle extends Build {
fork in Test := true,
libraryDependencies ++= Seq(
"commons-codec" % "commons-codec" % "1.5",
"com.twitter.common.zookeeper" % "server-set" % "1.0.67",
util("zk-common")
util("zk-common"),
"com.twitter.common.zookeeper" % "server-set" % "1.0.67"
) ++ jacksonLibs,
excludeFilter in unmanagedSources := "ZkTest.scala",
ivyXML :=
<dependencies>
<dependency org="com.twitter.common.zookeeper" name="server-set" rev="1.0.66">
<dependency org="com.twitter.common.zookeeper" name="server-set" rev="1.0.67">
<exclude org="com.google.guava" name="guava"/>
<exclude org="com.twitter" name="finagle-core"/>
<exclude org="com.twitter" name="finagle-thrift"/>
Expand Down

0 comments on commit 1d85771

Please sign in to comment.