Skip to content

Commit

Permalink
Remove tomcat-embed-core transitive dependency (close #501)
Browse files Browse the repository at this point in the history
  • Loading branch information
benjben committed Jan 26, 2022
1 parent ffc9a68 commit 8316085
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
9 changes: 9 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ lazy val common = project
Dependencies.Libraries.circeLiteral % Test
)
)
.settings(excludeDependencies ++= Dependencies.Libraries.exclusions)

lazy val allStreamSettings = BuildSettings.basicSettings ++ BuildSettings.sbtAssemblySettings ++
BuildSettings.dockerSettings ++ BuildSettings.formatting ++
Expand Down Expand Up @@ -98,6 +99,7 @@ lazy val streamCommon = project
buildInfoPackage := "com.snowplowanalytics.snowplow.enrich.stream.generated"
)
.dependsOn(common)
.settings(excludeDependencies ++= Dependencies.Libraries.exclusions)

lazy val streamKinesis = project
.in(file("modules/stream/kinesis"))
Expand All @@ -111,6 +113,7 @@ lazy val streamKinesis = project
))
.enablePlugins(JavaAppPackaging, DockerPlugin)
.dependsOn(streamCommon)
.settings(excludeDependencies ++= Dependencies.Libraries.exclusions)

lazy val streamKafka = project
.in(file("modules/stream/kafka"))
Expand All @@ -124,6 +127,7 @@ lazy val streamKafka = project
))
.enablePlugins(JavaAppPackaging, DockerPlugin)
.dependsOn(streamCommon)
.settings(excludeDependencies ++= Dependencies.Libraries.exclusions)

lazy val streamNsq = project
.in(file("modules/stream/nsq"))
Expand All @@ -139,6 +143,7 @@ lazy val streamNsq = project
))
.enablePlugins(JavaAppPackaging, DockerPlugin)
.dependsOn(streamCommon)
.settings(excludeDependencies ++= Dependencies.Libraries.exclusions)

lazy val streamStdin = project
.in(file("modules/stream/stdin"))
Expand All @@ -147,6 +152,7 @@ lazy val streamStdin = project
moduleName := "snowplow-stream-enrich-stdin",
)
.dependsOn(streamCommon)
.settings(excludeDependencies ++= Dependencies.Libraries.exclusions)

lazy val beam =
project
Expand Down Expand Up @@ -199,6 +205,7 @@ lazy val beam =
Test / testGrouping := BuildSettings.oneJVMPerTest((Test / definedTests).value)
)
.enablePlugins(JavaAppPackaging, DockerPlugin, BuildInfoPlugin)
.settings(excludeDependencies ++= Dependencies.Libraries.exclusions)

Global / onChangedBuildSource := ReloadOnSourceChanges

Expand Down Expand Up @@ -270,6 +277,7 @@ lazy val pubsub = project
.enablePlugins(BuildInfoPlugin)
.settings(BuildSettings.dockerSettings)
.enablePlugins(BuildInfoPlugin, JavaAppPackaging, DockerPlugin)
.settings(excludeDependencies ++= Dependencies.Libraries.exclusions)

lazy val kinesis = project
.in(file("modules/kinesis"))
Expand Down Expand Up @@ -297,6 +305,7 @@ lazy val kinesis = project
.enablePlugins(BuildInfoPlugin)
.settings(BuildSettings.dockerSettings)
.enablePlugins(BuildInfoPlugin, JavaAppPackaging, DockerPlugin)
.settings(excludeDependencies ++= Dependencies.Libraries.exclusions)

lazy val bench = project
.in(file("modules/bench"))
Expand Down
5 changes: 5 additions & 0 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -188,5 +188,10 @@ object Dependencies {
val pureconfigCirce = "com.github.pureconfig" %% "pureconfig-circe" % V.pureconfig
val http4sDsl = "org.http4s" %% "http4s-dsl" % V.http4s % Test
val http4sServer = "org.http4s" %% "http4s-blaze-server" % V.http4s % Test

// exclusions
val exclusions = Seq(
"org.apache.tomcat.embed" % "tomcat-embed-core"
)
}
}

0 comments on commit 8316085

Please sign in to comment.