Skip to content

Commit

Permalink
Merge pull request #30 from sclasen/kafka-082-akka-239
Browse files Browse the repository at this point in the history
kafka 0820 akka 239
  • Loading branch information
sclasen committed Feb 4, 2015
2 parents 08bfc73 + 4e31c75 commit 5f34baa
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 13 deletions.
4 changes: 2 additions & 2 deletions bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

ROOT=$(cd $(dirname $0)/..; pwd)

if [ ! -d "$ROOT/kafka-install/kafka_2.10-0.8.1.1" ]; then
if [ ! -d "$ROOT/kafka-install/kafka_2.11-0.8.2.0" ]; then
mkdir -p $ROOT/kafka-install

cd $ROOT/kafka-install

curl -L http://www.us.apache.org/dist/kafka/0.8.1.1/kafka_2.10-0.8.1.1.tgz | tar xvz
curl -L http://www.us.apache.org/dist/kafka/0.8.2.0/kafka_2.11-0.8.2.0.tgz | tar xvz
fi

18 changes: 10 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ organization := "com.sclasen"

name := "akka-kafka"

version := "0.0.11-SNAPSHOT"
version := "0.1.0"

scalaVersion := "2.10.4"
scalaVersion := "2.11.5"

crossScalaVersions := Seq("2.11.5", "2.10.4")

parallelExecution in Test := false

Expand All @@ -13,19 +15,19 @@ parallelExecution in Test := false
resolvers += "spray repo" at "http://repo.spray.io"


libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.3.2" % "compile"
libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.3.9" % "compile"

libraryDependencies += "com.typesafe.akka" %% "akka-slf4j" % "2.3.2" % "test,it"
libraryDependencies += "com.typesafe.akka" %% "akka-slf4j" % "2.3.9" % "test,it"

libraryDependencies += "org.apache.kafka" %% "kafka" %"0.8.1" exclude("log4j", "log4j") exclude("org.slf4j","slf4j-log4j12")
libraryDependencies += "org.apache.kafka" %% "kafka" % "0.8.2.0" exclude("log4j", "log4j") exclude("org.slf4j","slf4j-log4j12")

libraryDependencies += "com.typesafe.akka" %% "akka-testkit" % "2.3.2" % "test,it"
libraryDependencies += "com.typesafe.akka" %% "akka-testkit" % "2.3.9" % "test,it"

libraryDependencies += "org.scalatest" %% "scalatest" % "2.0" % "test,it"
libraryDependencies += "org.scalatest" %% "scalatest" % "2.2.1" % "test,it"

libraryDependencies += "commons-io" % "commons-io" % "2.4" % "test,it"

libraryDependencies += "org.slf4j" % "log4j-over-slf4j" % "1.6.6" % "provided"
libraryDependencies += "org.slf4j" % "log4j-over-slf4j" % "1.7.10" % "provided"

parallelExecution in Test := false

Expand Down
8 changes: 5 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ akka-kafka

Actor based kafka consumer built on top of the high level kafka consumer.

The `0.0.X` versions of akka-kafka were built with kafka `0.8.1.1`. Starting with `0.1.0` akka-kafka is built against the scala 2.11 version of kafka `0.8.2.0`

AkkaConsumer
------------

Expand All @@ -30,11 +32,11 @@ If you dont want to use slf4j, you can substitute log4j.
```scala
/* build.sbt */

libraryDependencies += "com.sclasen" %% "akka-kafka" % "0.0.10" % "compile"
libraryDependencies += "com.sclasen" %% "akka-kafka" % "0.1.0" % "compile"

libraryDependencies += "com.typesafe.akka" %% "akka-slf4j" % "2.3.2" % "compile"
libraryDependencies += "com.typesafe.akka" %% "akka-slf4j" % "2.3.9" % "compile"

libraryDependencies += "org.slf4j" % "log4j-over-slf4j" % "1.6.6" % "compile"
libraryDependencies += "org.slf4j" % "log4j-over-slf4j" % "1.7.10" % "compile"
```

AkkaConsumer
Expand Down

0 comments on commit 5f34baa

Please sign in to comment.