Merge pull request #14 from simplesteph/v1.1.0

v1.1.0

Author: simplesteph

.travis.yml

@@ -17,7 +17,13 @@ deploy:
     script: bash docker_push.sh
     skip_cleanup: true
     on:
-      all_branches: true
+      tags: true
+      condition: -z "$TRAVIS_PULL_REQUEST_BRANCH"
+  - provider: script
+    script: bash docker_push.sh
+    skip_cleanup: true
+    on:
+      branch: master
       condition: -z "$TRAVIS_PULL_REQUEST_BRANCH"
 #    tags: true / false  => has precendence over the branch condition
 #    condition: "foo == bar && baz==bat"

CHANGELOG.md

@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [Unreleased - 0.2]
+- Kafka 1.1.0
+- Updated Embedded Kafka to v1.1.0-kafka1.1.0 (test dependency)
 
 
 ## [0.1] - 08/03/2017

build.sbt

@@ -2,7 +2,7 @@ name := "kafka-security-manager"
 
 organization := "com.github.simplesteph.ksm"
 
-version := "0.1-SNAPSHOT"
+version := "0.2-SNAPSHOT"
 
 scalaVersion := "2.12.4"
 
@@ -11,12 +11,15 @@ lazy val root = (project in file("."))
   .enablePlugins(DockerPlugin)
 
 
-resolvers += "Artima Maven Repository" at "http://repo.artima.com/releases"
+resolvers ++= Seq(
+  "Artima Maven Repository" at "http://repo.artima.com/releases",
+  "confluent" at "https://packages.confluent.io/maven/",
+)
 
 libraryDependencies ++= Seq(
   // kafka
-  "org.apache.kafka" %% "kafka" % "1.0.1",
-  "net.manub" %% "scalatest-embedded-kafka" % "1.0.0" % "test",
+  "org.apache.kafka" %% "kafka" % "1.1.0",
+  "net.manub" %% "scalatest-embedded-kafka" % "1.1.0-kafka1.1" % "test",
 
   // logging
   "org.slf4j" % "slf4j-api" % "1.7.25",