Skip to content

Commit 7f41a1c

Browse files
committed
Merge pull request #12 from kciesielski/tweaks-fixes
Some tweaks and fixes
2 parents 791b418 + c7f9c19 commit 7f41a1c

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

build.sbt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
import sbtrelease.Version
22

3+
val slf4jLog4jOrg = "org.slf4j"
4+
val slf4jLog4jArtifact = "slf4j-log4j12"
5+
36
lazy val commonSettings = Seq(
47
name := "scalatest-embedded-kafka",
58
organization := "net.manub",
6-
crossScalaVersions := Seq("2.10.6", "2.11.7"),
9+
crossScalaVersions := Seq("2.10.6", "2.11.8"),
710
homepage := Some(url("https://github.com/manub/scalatest-embedded-kafka")),
811
parallelExecution in Test := false,
912
libraryDependencies ++= Seq(
1013
"org.scalatest" %% "scalatest" % "2.2.5",
11-
"org.apache.kafka" %% "kafka" % "0.9.0.0",
12-
"org.apache.zookeeper" % "zookeeper" % "3.4.7",
13-
"org.apache.avro" % "avro" % "1.7.7",
14-
14+
"org.apache.kafka" %% "kafka" % "0.9.0.1" exclude(slf4jLog4jOrg, slf4jLog4jArtifact),
15+
"org.apache.zookeeper" % "zookeeper" % "3.4.7" exclude(slf4jLog4jOrg, slf4jLog4jArtifact),
16+
"org.apache.avro" % "avro" % "1.7.7" exclude(slf4jLog4jOrg, slf4jLog4jArtifact),
1517
"com.typesafe.akka" %% "akka-actor" % "2.3.14" % Test,
1618
"com.typesafe.akka" %% "akka-testkit" % "2.3.14" % Test
1719
)

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 0.13.8
1+
sbt.version = 0.13.11

src/main/scala/net/manub/embeddedkafka/EmbeddedKafka.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ sealed trait EmbeddedKafkaSupport {
217217
val zkServer = new ZooKeeperServer(zkLogsDir.toFile.jfile, zkLogsDir.toFile.jfile, tickTime)
218218

219219
val factory = ServerCnxnFactory.createFactory
220-
factory.configure(new InetSocketAddress("localhost", zooKeeperPort), 1024)
220+
factory.configure(new InetSocketAddress("0.0.0.0", zooKeeperPort), 1024)
221221
factory.startup(zkServer)
222222
factory
223223
}
@@ -229,6 +229,7 @@ sealed trait EmbeddedKafkaSupport {
229229
properties.setProperty("zookeeper.connect", zkAddress)
230230
properties.setProperty("broker.id", "0")
231231
properties.setProperty("host.name", "localhost")
232+
properties.setProperty("advertised.host.name", "localhost")
232233
properties.setProperty("auto.create.topics.enable", "true")
233234
properties.setProperty("port", config.kafkaPort.toString)
234235
properties.setProperty("log.dir", kafkaLogDir.toAbsolute.path)

0 commit comments

Comments
 (0)