You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by jg...@apache.org on 2014/06/25 18:49:45 UTC
git commit: SAMZA-284: Resolve bundled Kafka jar issue
Repository: incubator-samza
Updated Branches:
refs/heads/master 702e62483 -> 2c957e707
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/2c957e70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/2c957e70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/2c957e70
Branch: refs/heads/master
Commit: 2c957e7079023faef175f95823ae9e98ea6fb2ff
Parents: 702e624
Author: Jakob Homan <jg...@apache.org>
Authored: Wed Jun 25 09:49:36 2014 -0700
Committer: Jakob Homan <jg...@apache.org>
Committed: Wed Jun 25 09:49:36 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/2c957e70/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 1bbd5ca..f728330 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"
@@ -267,8 +266,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/2c957e70/gradle/dependency-versions.gradle
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.gradle b/gradle/dependency-versions.gradle
index 8f445f8..0787258 100644
--- a/gradle/dependency-versions.gradle
+++ b/gradle/dependency-versions.gradle
@@ -26,7 +26,7 @@
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.4.0"
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/2c957e70/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/2c957e70/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