@@ -69,6 +69,7 @@ lazy val dependencies =
69
69
val scalaTest = " org.scalatest" %% " scalatest" % scalaTestVersion % Test
70
70
val scalaDockerTest = " com.whisk" %% " docker-testkit-scalatest" % dockerTestKitVersion % Test
71
71
val spotifyDockerTest = " com.whisk" %% " docker-testkit-impl-spotify" % dockerTestKitVersion % Test
72
+ val slf4jLogging = " org.slf4j" % " slf4j-log4j12" % " 1.7.5" % Test
72
73
73
74
val kudu = " org.apache.kudu" % " kudu-client" % kuduVersion
74
75
val kuduTestUtils = " org.apache.kudu" % " kudu-test-utils" % kuduVersion % Test
@@ -88,14 +89,15 @@ lazy val dependencies =
88
89
val akkaHttp = " com.typesafe.akka" %% " akka-http" % akkaHttpVersion
89
90
val akkaHttpSprayJson = " com.typesafe.akka" %% " akka-http-spray-json" % akkaHttpVersion
90
91
val akkaCors = " ch.megard" %% " akka-http-cors" % akkaCorsVersion
92
+ val akka = " com.typesafe.akka" %% " akka-actor" % akkaVersion
91
93
92
94
val akkaTestKit = " com.typesafe.akka" %% " akka-testkit" % " 2.4.20" % Test
93
95
val akkaHttpTest = " com.typesafe.akka" %% " akka-http-testkit" % akkaHttpVersion % Test
94
96
95
- val solrj4 = " org.apache.solr" % " solr-solrj" % solrj4Version exclude (" org.slf4j" , " *" )
97
+ val solrj4 = " org.apache.solr" % " solr-solrj" % solrj4Version exclude (" org.slf4j" , " *" )
96
98
val solr4Test = " org.apache.solr" % " solr-test-framework" % solrj4Version % Test exclude (" org.slf4j" , " *" )
97
99
98
- val solrj7 = " org.apache.solr" % " solr-solrj" % solrj7Version exclude (" org.slf4j" , " *" )
100
+ val solrj7 = " org.apache.solr" % " solr-solrj" % solrj7Version exclude (" org.slf4j" , " *" )
99
101
val solr7Test = " org.apache.solr" % " solr-test-framework" % solrj7Version % Test exclude (" org.slf4j" , " *" )
100
102
101
103
val solr4 = Seq (solrj4, commonsCodec, solr4Test)
@@ -120,9 +122,10 @@ lazy val dependencies =
120
122
val cats = " org.typelevel" %% " cats-core" % " 1.1.0"
121
123
val monix = " io.monix" %% " monix" % monixVersion
122
124
123
- val common = Seq (scalaLogging, scalaTest, logback, commonsLogging, cats)
124
- val cli = Seq (scallop, scalaYaml)
125
- val all = common ++ cli ++ Seq (scalaDockerTest, spotifyDockerTest)
125
+ val common = Seq (scalaLogging, scalaTest, slf4jLogging, commonsLogging, cats)
126
+
127
+ val cli = Seq (scallop, scalaYaml)
128
+ val all = common ++ cli ++ Seq (scalaDockerTest, spotifyDockerTest)
126
129
127
130
val http = Seq (akkaHttp, akkaHttpSprayJson, akkaCors, akkaTestKit, akkaHttpTest)
128
131
@@ -169,7 +172,8 @@ lazy val `log-collector` = project
169
172
dependencies.kudu,
170
173
dependencies.kuduBinary,
171
174
dependencies.kuduTestUtils
172
- ) ++ dependencies.solr ++ dependencies.common
175
+ ) ++ dependencies.solr ++ dependencies.common,
176
+ dependencyOverrides += dependencies.akka
173
177
)
174
178
.dependsOn(common)
175
179
.dependsOn(solrModule)
@@ -202,18 +206,14 @@ lazy val `alert-engine` = project
202
206
.dependsOn(solrModule % " test->test" )
203
207
204
208
lazy val `common` = project
205
- .settings(
206
- name := " common" ,
207
- settings,
208
- libraryDependencies ++= dependencies.common ++ dependencies.http
209
- )
209
+ .settings(name := " common" , settings, libraryDependencies ++= dependencies.common :+ dependencies.akkaHttpSprayJson)
210
210
211
211
lazy val `solr4` = project
212
212
.settings(
213
213
name := " solr4" ,
214
214
settings,
215
215
libraryDependencies ++= dependencies.common ++ dependencies.solr4 ++ Seq (
216
- " org.scalatest" %% " scalatest" % scalaTestVersion
216
+ " org.scalatest" %% " scalatest" % scalaTestVersion
217
217
)
218
218
)
219
219
.dependsOn(common)
@@ -223,7 +223,7 @@ lazy val solr7 = project
223
223
name := " solr7" ,
224
224
settings,
225
225
libraryDependencies ++= (dependencies.common ++ dependencies.solr7 ++ Seq (
226
- " org.scalatest" %% " scalatest" % scalaTestVersion
226
+ " org.scalatest" %% " scalatest" % scalaTestVersion
227
227
))
228
228
)
229
229
.dependsOn(common)
@@ -239,25 +239,26 @@ lazy val `log-example` = project
239
239
.dependsOn(`log-appender`)
240
240
241
241
// Library versions
242
- val logbackVersion = " 1.2.3"
243
- val scalaLoggingVersion = " 3.7.2"
244
- val scallopVersion = " 3.1.5"
245
- val scalaYamlVersion = " 0.4.0"
246
- val scalaTestVersion = " 3.0.8"
247
- val dockerTestKitVersion = " 0.9.5"
248
- val solrj4Version = " 4.10.3-cdh5.12.1"
249
- val solrj7Version = " 7.4.0-cdh6.1.1"
250
- val akkaHttpVersion = " 10.0.15"
251
- val akkaCorsVersion = " 0.2.2"
252
- val sprayJsonVersion = " 1.3.5"
253
- val sparkVersion = " 2.2.0.cloudera1"
254
- val log4jVersion = " 1.2.17"
255
- val httpClientVersion = " 4.5.5"
256
- val jacksonVersion = " 2.9.4"
257
- val junitVersion = " 4.12"
258
- val javaMailVersion = " 1.4"
259
- val mockitoVersion = " 1.10.19"
260
- val powerMockVersion = " 1.6.6"
261
- val monixVersion = " 2.3.3"
262
- val kuduVersion = " 1.10.0"
263
- val catsCoreVersion = " 1.6.0"
242
+ val logbackVersion = " 1.2.3"
243
+ val scalaLoggingVersion = " 3.7.2"
244
+ val scallopVersion = " 3.1.5"
245
+ val scalaYamlVersion = " 0.4.0"
246
+ val scalaTestVersion = " 3.0.8"
247
+ val dockerTestKitVersion = " 0.9.5"
248
+ val solrj4Version = " 4.10.3-cdh5.12.1"
249
+ val solrj7Version = " 7.4.0-cdh6.1.1"
250
+ val akkaVersion = " 2.5.8"
251
+ val akkaHttpVersion = " 10.0.15"
252
+ val akkaCorsVersion = " 0.2.2"
253
+ val sprayJsonVersion = " 1.3.5"
254
+ val sparkVersion = " 2.2.0.cloudera1"
255
+ val log4jVersion = " 1.2.17"
256
+ val httpClientVersion = " 4.5.5"
257
+ val jacksonVersion = " 2.9.4"
258
+ val junitVersion = " 4.12"
259
+ val javaMailVersion = " 1.4"
260
+ val mockitoVersion = " 1.10.19"
261
+ val powerMockVersion = " 1.6.6"
262
+ val monixVersion = " 2.3.3"
263
+ val kuduVersion = " 1.10.0"
264
+ val catsCoreVersion = " 1.6.0"
0 commit comments