Skip to content

Commit

Permalink
Merge pull request #1572 from ennru/upgrade-alpakka-kafka
Browse files Browse the repository at this point in the history
Alpakka Kafka 1.0.1, Embedded Kafka 2.1.1
  • Loading branch information
2m authored Mar 12, 2019
2 parents 7c91067 + 0179420 commit 0a231c3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion doc-examples/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
</appender>

<logger name="org.apache" level="WARN"/>
<logger name="kafka" level="WARN"/>
<logger name="akka" level="WARN"/>
<logger name="akka.kafka.benchmarks" level="INFO"/>
<logger name="org.apache.kafka.common.utils.AppInfoParser" level="ERROR"/>
Expand All @@ -42,4 +43,4 @@
<appender-ref ref="console"/>
</root>

</configuration>
</configuration>
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ object Dependencies {
"com.typesafe.akka" %% "akka-http-xml" % AkkaHttpVersion,
"com.typesafe.akka" %% "akka-http-spray-json" % AkkaHttpVersion,
// https://github.com/akka/alpakka-kafka/releases
"com.typesafe.akka" %% "akka-stream-kafka" % "1.0",
// https://github.com/manub/scalatest-embedded-kafka/tags
"net.manub" %% "scalatest-embedded-kafka" % "1.1.0", // MIT
"com.typesafe.akka" %% "akka-stream-kafka" % "1.0.1",
// https://github.com/embeddedkafka/embedded-kafka/releases
"io.github.embeddedkafka" %% "embedded-kafka" % "2.1.1", // MIT
// https://github.com/javaee/javax.jms
"javax.jms" % "jms" % "1.1", // CDDL Version 1.1
// http://activemq.apache.org/download.html
Expand Down

0 comments on commit 0a231c3

Please sign in to comment.