KAFKA-133 publish kafka to maven - patch by Maxime Brugidou with updates for depen by Otis Gospodnetic, reviewed by Joe Stein
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/ddd66cbd Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/ddd66cbd Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/ddd66cbd Branch: refs/heads/trunk Commit: ddd66cbd80d1765898fd82322dc5c5afc9b29fba Parents: e0b3b63 Author: Joe Stein <joest...@apache.org> Authored: Wed Jan 9 16:48:23 2013 -0800 Committer: Joe Stein <joest...@apache.org> Committed: Wed Jan 9 16:48:23 2013 -0800 ---------------------------------------------------------------------- project/build.properties | 2 +- project/build/KafkaProject.scala | 44 ++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/ddd66cbd/project/build.properties ---------------------------------------------------------------------- diff --git a/project/build.properties b/project/build.properties index a8895d3..6222624 100644 --- a/project/build.properties +++ b/project/build.properties @@ -16,7 +16,7 @@ #Mon Feb 28 11:55:49 PST 2011 project.name=Kafka sbt.version=0.7.5 -project.version=0.8.0 +project.version=0.8.0-SNAPSHOT build.scala.versions=2.8.0 contrib.root.dir=contrib lib.dir=lib http://git-wip-us.apache.org/repos/asf/kafka/blob/ddd66cbd/project/build/KafkaProject.scala ---------------------------------------------------------------------- diff --git a/project/build/KafkaProject.scala b/project/build/KafkaProject.scala index 8bdf3cc..48d1930 100644 --- a/project/build/KafkaProject.scala +++ b/project/build/KafkaProject.scala @@ -20,6 +20,10 @@ import scala.xml.{Node, Elem} import scala.xml.transform.{RewriteRule, RuleTransformer} class KafkaProject(info: ProjectInfo) extends ParentProject(info) with IdeaProject { + override def managedStyle = ManagedStyle.Maven + val publishTo = "Maven Repo" at "http://maven/content/repositories/repository.snapshots" + Credentials(Path.userHome / ".m2" / ".credentials", log) + lazy val core = project("core", "core-kafka", new CoreKafkaProject(_)) lazy val examples = project("examples", "java-examples", new KafkaExamplesProject(_), core) lazy val contrib = project("contrib", "contrib", new ContribProject(_)) @@ -60,27 +64,27 @@ class KafkaProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje def zkClientDep = <dependency> - <groupId>zkclient</groupId> + <groupId>com.101tec</groupId> <artifactId>zkclient</artifactId> - <version>20120522</version> + <version>0.2</version> + <scope>compile</scope> + </dependency> + + def metricsDepsCore = + <dependency> + <groupId>com.yammer.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>3.0.0-SNAPSHOT</version> <scope>compile</scope> </dependency> - def metricsDeps = - <dependencies> - <dependency> - <groupId>com.yammer.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>3.0.0-c0c8be71</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.yammer.metrics</groupId> - <artifactId>metrics-annotations</artifactId> - <version>3.0.0-c0c8be71</version> - <scope>compile</scope> - </dependency> - </dependencies> + def metricsDepsAnnotations = + <dependency> + <groupId>com.yammer.metrics</groupId> + <artifactId>metrics-annotation</artifactId> + <version>3.0.0-SNAPSHOT</version> + <scope>compile</scope> + </dependency> object ZkClientDepAdder extends RuleTransformer(new RewriteRule() { override def transform(node: Node): Seq[Node] = node match { @@ -94,7 +98,7 @@ class KafkaProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje object MetricsDepAdder extends RuleTransformer(new RewriteRule() { override def transform(node: Node): Seq[Node] = node match { case Elem(prefix, "dependencies", attribs, scope, deps @ _*) => { - Elem(prefix, "dependencies", attribs, scope, deps ++ metricsDeps:_*) + Elem(prefix, "dependencies", attribs, scope, deps ++ metricsDepsCore ++ metricsDepsAnnotations:_*) } case other => other } @@ -104,7 +108,7 @@ class KafkaProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje MetricsDepAdder(ZkClientDepAdder(pom)) } - override def artifactID = "kafka" + override def organization = "org.apache" override def filterScalaJars = false // build the executable jar's classpath. @@ -276,7 +280,7 @@ class KafkaProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje trait CoreDependencies { val log4j = "log4j" % "log4j" % "1.2.15" val jopt = "net.sf.jopt-simple" % "jopt-simple" % "3.2" - val slf4jSimple = "org.slf4j" % "slf4j-simple" % "latest.release" + val slf4jSimple = "org.slf4j" % "slf4j-simple" % "1.6.4" } trait HadoopDependencies {