Skip to content

Some tweaks and fixes #12

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

Merged
merged 5 commits into from
May 12, 2016
Merged

Some tweaks and fixes #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33feb85
Update to Kafka 0.9.0.1
kciesielski May 12, 2016
3630e0c
Tune ZK/Kafka network binding configuration
kciesielski May 12, 2016
1b355dd
Exclude slf4j->log4j bridge
kciesielski May 12, 2016
9414dee
Update to SBT 0.13.11
kciesielski May 12, 2016
c7f9c19
Bring back Scala 2.10 support
kciesielski May 12, 2016
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
12 changes: 7 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import sbtrelease.Version

val slf4jLog4jOrg = "org.slf4j"
val slf4jLog4jArtifact = "slf4j-log4j12"

lazy val commonSettings = Seq(
Copy link
Owner

Choose a reason for hiding this comment

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

I still have clients that use 2.10. Would that cause an issue?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That was a local change that wasn't supposed to get committed, fixing.

name := "scalatest-embedded-kafka",
organization := "net.manub",
crossScalaVersions := Seq("2.10.6", "2.11.7"),
crossScalaVersions := Seq("2.10.6", "2.11.8"),
homepage := Some(url("https://github.com/manub/scalatest-embedded-kafka")),
parallelExecution in Test := false,
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "2.2.5",
"org.apache.kafka" %% "kafka" % "0.9.0.0",
"org.apache.zookeeper" % "zookeeper" % "3.4.7",
"org.apache.avro" % "avro" % "1.7.7",

"org.apache.kafka" %% "kafka" % "0.9.0.1" exclude(slf4jLog4jOrg, slf4jLog4jArtifact),
"org.apache.zookeeper" % "zookeeper" % "3.4.7" exclude(slf4jLog4jOrg, slf4jLog4jArtifact),
"org.apache.avro" % "avro" % "1.7.7" exclude(slf4jLog4jOrg, slf4jLog4jArtifact),
"com.typesafe.akka" %% "akka-actor" % "2.3.14" % Test,
"com.typesafe.akka" %% "akka-testkit" % "2.3.14" % Test
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 0.13.8
sbt.version = 0.13.11
3 changes: 2 additions & 1 deletion src/main/scala/net/manub/embeddedkafka/EmbeddedKafka.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ sealed trait EmbeddedKafkaSupport {
val zkServer = new ZooKeeperServer(zkLogsDir.toFile.jfile, zkLogsDir.toFile.jfile, tickTime)

val factory = ServerCnxnFactory.createFactory
factory.configure(new InetSocketAddress("localhost", zooKeeperPort), 1024)
factory.configure(new InetSocketAddress("0.0.0.0", zooKeeperPort), 1024)
factory.startup(zkServer)
factory
}
Expand All @@ -229,6 +229,7 @@ sealed trait EmbeddedKafkaSupport {
properties.setProperty("zookeeper.connect", zkAddress)
properties.setProperty("broker.id", "0")
properties.setProperty("host.name", "localhost")
properties.setProperty("advertised.host.name", "localhost")
properties.setProperty("auto.create.topics.enable", "true")
properties.setProperty("port", config.kafkaPort.toString)
properties.setProperty("log.dir", kafkaLogDir.toAbsolute.path)
Expand Down