Repository: incubator-samza Updated Branches: refs/heads/0.7.0 aa0e7636c -> 5e34ec9bf
SAMZA-284: Resolve bundled Kafka jar issue Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/5e34ec9b Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/5e34ec9b Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/5e34ec9b Branch: refs/heads/0.7.0 Commit: 5e34ec9bf9d486caa464aca1e8bc5ce2a1f780f1 Parents: aa0e763 Author: Jakob Homan <[email protected]> Authored: Wed Jun 25 09:57:41 2014 -0700 Committer: Jakob Homan <[email protected]> Committed: Wed Jun 25 09:57:41 2014 -0700 ---------------------------------------------------------------------- build.gradle | 6 ++---- gradle/dependency-versions.gradle | 2 +- .../lib/kafka_2.10-0.8.1-SNAPSHOT-test.jar | Bin 913564 -> 0 bytes .../lib/kafka_2.9.2-0.8.1-SNAPSHOT-test.jar | Bin 906945 -> 0 bytes 4 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/5e34ec9b/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index b5ecacd..1942809 100644 --- a/build.gradle +++ b/build.gradle @@ -100,10 +100,9 @@ project(":samza-kafka_$scalaVersion") { compile "org.apache.zookeeper:zookeeper:$zookeeperVersion" compile "org.codehaus.jackson:jackson-jaxrs:$jacksonVersion" compile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion" + testCompile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion:test" testCompile "junit:junit:$junitVersion" testCompile "org.mockito:mockito-all:$mockitoVersion" - // TODO replace this with an official release, if possible - testCompile files("lib/kafka_$scalaVersion-0.8.1-SNAPSHOT-test.jar") // Logging in tests is good. testRuntime "org.slf4j:slf4j-simple:$slf4jVersion" @@ -257,8 +256,7 @@ project(":samza-test_$scalaVersion") { compile "javax.mail:mail:1.4" compile "junit:junit:$junitVersion" compile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion" - // TODO replace this with an official release, if possible - testCompile files("../samza-kafka/lib/kafka_$scalaVersion-0.8.1-SNAPSHOT-test.jar") + testCompile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion:test" testCompile "com.101tec:zkclient:$zkClientVersion" testCompile project(":samza-kafka_$scalaVersion") testRuntime "org.slf4j:slf4j-simple:$slf4jVersion" http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/5e34ec9b/gradle/dependency-versions.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions.gradle b/gradle/dependency-versions.gradle index e1fa072..b612736 100644 --- a/gradle/dependency-versions.gradle +++ b/gradle/dependency-versions.gradle @@ -25,7 +25,7 @@ ext { zkClientVersion = "0.3" zookeeperVersion = "3.3.4" metricsVersion = "2.2.0" - kafkaVersion = "0.8.1" + kafkaVersion = "0.8.1.1" commonsHttpClientVersion = "3.1" leveldbVersion = "1.8" yarnVersion = "2.2.0" http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/5e34ec9b/samza-kafka/lib/kafka_2.10-0.8.1-SNAPSHOT-test.jar ---------------------------------------------------------------------- diff --git a/samza-kafka/lib/kafka_2.10-0.8.1-SNAPSHOT-test.jar b/samza-kafka/lib/kafka_2.10-0.8.1-SNAPSHOT-test.jar deleted file mode 100644 index 8079578..0000000 Binary files a/samza-kafka/lib/kafka_2.10-0.8.1-SNAPSHOT-test.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/5e34ec9b/samza-kafka/lib/kafka_2.9.2-0.8.1-SNAPSHOT-test.jar ---------------------------------------------------------------------- diff --git a/samza-kafka/lib/kafka_2.9.2-0.8.1-SNAPSHOT-test.jar b/samza-kafka/lib/kafka_2.9.2-0.8.1-SNAPSHOT-test.jar deleted file mode 100644 index b91fc78..0000000 Binary files a/samza-kafka/lib/kafka_2.9.2-0.8.1-SNAPSHOT-test.jar and /dev/null differ
