Skip to content

zkclient and scalatest library updates #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
polymorphic wants to merge 3 commits into from
Closed

zkclient and scalatest library updates #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9699033
Initial commit after fork
Mar 25, 2013
7183a5c
Updated zkclient dependency to 0.2
Mar 25, 2013
1bf9150
Fixed typo in ConsoleProducer; updated scalatest version for 2.9.2 (i…
Mar 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ )

libraryDependencies ++= Seq(
"org.apache.zookeeper" % "zookeeper" % "3.3.4",
"com.github.sgroschupf" % "zkclient" % "0.1",
"org.xerial.snappy" % "snappy-java" % "1.0.4.1",
"org.easymock" % "easymock" % "3.0" % "test",
"junit" % "junit" % "4.1" % "test"
)

libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) =>
deps :+ (sv match {
case "2.8.0" => "org.scalatest" % "scalatest" % "1.2" % "test"
case _ => "org.scalatest" %% "scalatest" % "1.8" % "test"
case "2.8.0" => "org.scalatest" % "scalatest" % "1.2" % "test"
case "2.9.2" => "org.scalatest" %% "scalatest" % "1.9.1" % "test"
case _ => "org.scalatest" %% "scalatest" % "1.8" % "test"
})
}

Expand Down
Binary file removed core/lib/zkclient-20120522.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion core/src/main/scala/kafka/producer/ConsoleProducer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ object ConsoleProducer {
topic = props.getProperty("topic")
if(props.containsKey("parse.key"))
parseKey = props.getProperty("parse.key").trim.toLowerCase.equals("true")
if(props.containsKey("key.seperator"))
if(props.containsKey("key.separator"))
keySeparator = props.getProperty("key.separator")
if(props.containsKey("ignore.error"))
ignoreError = props.getProperty("ignore.error").trim.toLowerCase.equals("true")
Expand Down
9 changes: 5 additions & 4 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ object KafkaBuild extends Build {
libraryDependencies ++= Seq(
"log4j" % "log4j" % "1.2.15",
"net.sf.jopt-simple" % "jopt-simple" % "3.2",
"org.slf4j" % "slf4j-simple" % "1.6.4"
"org.slf4j" % "slf4j-simple" % "1.6.4",
"com.101tec" % "zkclient" % "0.2"
),
// The issue is going from log4j 1.2.14 to 1.2.15, the developers added some features which required
// some dependencies on various sun and javax packages.
Expand Down Expand Up @@ -100,9 +101,9 @@ object KafkaBuild extends Build {
// POM Tweaking for core:
def zkClientDep =
<dependency>
<groupId>zkclient</groupId>
<groupId>com.101tec</groupId>
<artifactId>zkclient</artifactId>
<version>20120522</version>
<version>0.2</version>
<scope>compile</scope>
</dependency>

Expand All @@ -116,7 +117,7 @@ object KafkaBuild extends Build {
</dependency>
<dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-annotations</artifactId>
<artifactId>metrics-annotation</artifactId>
<version>3.0.0-c0c8be71</version>
<scope>compile</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions project/build/KafkaProject.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ class KafkaProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje
<dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-c0c8be71</version>
<scope>compile</scope>
</dependency>

def metricsDepsAnnotations =
<dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-annotation</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-c0c8be71</version>
<scope>compile</scope>
</dependency>

Expand Down
1 change: 1 addition & 0 deletions sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/sh
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand Down