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

Fix jackson sbt assembly duplicate depends issue #867

Closed
wants to merge 1 commit into from
Closed

Fix jackson sbt assembly duplicate depends issue #867

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 5 additions & 9 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ lazy val finagleZipkinCore = Project(
libraryDependencies ++= Seq(
util("codec"),
util("core"),
util("stats")) ++ scroogeLibs ++ jacksonLibs
util("stats")) ++ scroogeLibs
).dependsOn(finagleCore, finagleThrift)

lazy val finagleZipkinScribe = Project(
Expand All @@ -497,8 +497,7 @@ lazy val finagleException = Project(
name := "finagle-exception",
libraryDependencies ++= Seq(
util("codec")
) ++ scroogeLibs,
libraryDependencies ++= jacksonLibs
) ++ scroogeLibs
Copy link
Contributor

Choose a reason for hiding this comment

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

finagle-exception uses jackson directly, so it really should have a dependency on jackson.

).dependsOn(finagleCore, finagleThrift)

lazy val finagleServersets = Project(
Expand All @@ -520,7 +519,6 @@ lazy val finagleServersets = Project(
),
"commons-lang" % "commons-lang" % "2.6"
),
libraryDependencies ++= jacksonLibs,
Copy link
Contributor

Choose a reason for hiding this comment

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

finagle-serversets does too, so it should too.

libraryDependencies ++= scroogeLibs,
ScroogeSBT.autoImport.scroogeLanguages in Compile := Seq("java"),
excludeFilter in unmanagedSources := "ZkTest.scala",
Expand Down Expand Up @@ -557,8 +555,7 @@ lazy val finagleTunable = Project(
libraryDependencies ++= Seq(
util("core"),
util("tunable")
),
libraryDependencies ++= jacksonLibs
)
).dependsOn(finagleToggle)

// Protocol support
Expand Down Expand Up @@ -646,8 +643,7 @@ lazy val finagleMemcached = Project(
util("zk-test") % "test",
"com.twitter" %% "bijection-core" % "0.9.7",
"org.apache.thrift" % "libthrift" % libthriftVersion
),
libraryDependencies ++= jacksonLibs
)
).dependsOn(
// NOTE: Order is important here.
// finagleNetty4 must come before finagleCore here, otherwise
Expand Down Expand Up @@ -720,7 +716,7 @@ lazy val finagleMySQL = Project(
util("stats"),
caffeineLib,
jsr305Lib
) ++ jacksonLibs,
),
Copy link
Contributor

Choose a reason for hiding this comment

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

finagle-mysql too.

excludeFilter in unmanagedSources := {
"EmbeddableMysql.scala" || "ClientTest.scala"
}
Expand Down