From 74b42a8f810281e26d80d764fc8f391836b87844 Mon Sep 17 00:00:00 2001 From: Jason Rosenberg Date: Mon, 3 Feb 2014 21:16:28 -0800 Subject: [PATCH] KAFKA-1164 kafka should depend on snappy 1.0.5 (instead of 1.0.4.1); reviewed by Neha Narkhede --- 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(-) diff --git a/bin/windows/kafka-run-class.bat b/bin/windows/kafka-run-class.bat index 62941b5758b..f274cd7d883 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 diff --git a/core/build.sbt b/core/build.sbt index b5bcb44f783..3eff64ef3f1 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", diff --git a/project/build/KafkaProject.scala b/project/build/KafkaProject.scala index cd406c18868..f29c67a47fe 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" } } 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 08eaea87f5a..ec92a343ebf 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