Updated Branches: refs/heads/trunk 2b0c6a7d7 -> 74b42a8f8
KAFKA-1164 kafka should depend on snappy 1.0.5 (instead of 1.0.4.1); reviewed by Neha Narkhede Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/74b42a8f Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/74b42a8f Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/74b42a8f Branch: refs/heads/trunk Commit: 74b42a8f810281e26d80d764fc8f391836b87844 Parents: 2b0c6a7 Author: Jason Rosenberg <[email protected]> Authored: Mon Feb 3 21:16:28 2014 -0800 Committer: Neha Narkhede <[email protected]> Committed: Mon Feb 3 21:16:55 2014 -0800 ---------------------------------------------------------------------- bin/windows/kafka-run-class.bat | 2 +- core/build.sbt | 2 +- project/build/KafkaProject.scala | 2 +- system_test/migration_tool_testsuite/0.7/bin/kafka-run-class.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/74b42a8f/bin/windows/kafka-run-class.bat ---------------------------------------------------------------------- diff --git a/bin/windows/kafka-run-class.bat b/bin/windows/kafka-run-class.bat index 62941b5..f274cd7 100644 --- a/bin/windows/kafka-run-class.bat +++ b/bin/windows/kafka-run-class.bat @@ -27,7 +27,7 @@ echo %BASE_DIR% set ivyPath=%USERPROFILE%\.ivy2\cache -set snappy=%ivyPath%/org.xerial.snappy/snappy-java/bundles/snappy-java-1.0.4.1.jar +set snappy=%ivyPath%/org.xerial.snappy/snappy-java/bundles/snappy-java-1.0.5.jar call :concat %snappy% set library=%ivyPath%/org.scala-lang/scala-library/jars/scala-library-2.8.0.jar http://git-wip-us.apache.org/repos/asf/kafka/blob/74b42a8f/core/build.sbt ---------------------------------------------------------------------- diff --git a/core/build.sbt b/core/build.sbt index b5bcb44..3eff64e 100644 --- a/core/build.sbt +++ b/core/build.sbt @@ -13,7 +13,7 @@ libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ ) libraryDependencies ++= Seq( "org.apache.zookeeper" % "zookeeper" % "3.3.4", "com.101tec" % "zkclient" % "0.3", - "org.xerial.snappy" % "snappy-java" % "1.0.4.1", + "org.xerial.snappy" % "snappy-java" % "1.0.5", "com.yammer.metrics" % "metrics-core" % "2.2.0", "com.yammer.metrics" % "metrics-annotation" % "2.2.0", "org.easymock" % "easymock" % "3.0" % "test", http://git-wip-us.apache.org/repos/asf/kafka/blob/74b42a8f/project/build/KafkaProject.scala ---------------------------------------------------------------------- diff --git a/project/build/KafkaProject.scala b/project/build/KafkaProject.scala index cd406c1..f29c67a 100644 --- a/project/build/KafkaProject.scala +++ b/project/build/KafkaProject.scala @@ -246,6 +246,6 @@ class KafkaProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje } trait CompressionDependencies { - val snappy = "org.xerial.snappy" % "snappy-java" % "1.0.4.1" + val snappy = "org.xerial.snappy" % "snappy-java" % "1.0.5" } } http://git-wip-us.apache.org/repos/asf/kafka/blob/74b42a8f/system_test/migration_tool_testsuite/0.7/bin/kafka-run-class.sh ---------------------------------------------------------------------- diff --git a/system_test/migration_tool_testsuite/0.7/bin/kafka-run-class.sh b/system_test/migration_tool_testsuite/0.7/bin/kafka-run-class.sh index 08eaea8..ec92a34 100755 --- a/system_test/migration_tool_testsuite/0.7/bin/kafka-run-class.sh +++ b/system_test/migration_tool_testsuite/0.7/bin/kafka-run-class.sh @@ -20,7 +20,7 @@ then exit 1 fi -snappy=~/.ivy2/cache/org.xerial.snappy/snappy-java/bundles/snappy-java-1.0.4.1.jar +snappy=~/.ivy2/cache/org.xerial.snappy/snappy-java/bundles/snappy-java-1.0.5.jar CLASSPATH=$CLASSPATH:$snappy library=~/.ivy2/cache/org.scala-lang/scala-library/jars/scala-library-2.8.0.jar CLASSPATH=$CLASSPATH:$library
