You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by jo...@apache.org on 2013/01/22 03:34:12 UTC
git commit: KAFKA-139 cross-compile multiple Scala versions the
dependency jars moved and the bin scripts needed to point to the new
locations
Updated Branches:
refs/heads/0.8 d5c980a91 -> 5e3e181ac
KAFKA-139 cross-compile multiple Scala versions the dependency jars moved and the bin scripts needed to point to the new locations
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/5e3e181a
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/5e3e181a
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/5e3e181a
Branch: refs/heads/0.8
Commit: 5e3e181aceb22dd7054f134beee53e185dc0d05b
Parents: d5c980a
Author: Joe Stein <jo...@apache.org>
Authored: Mon Jan 21 21:33:53 2013 -0500
Committer: Joe Stein <jo...@apache.org>
Committed: Mon Jan 21 21:33:53 2013 -0500
----------------------------------------------------------------------
bin/kafka-run-class.sh | 18 +++++++++++++-----
core/build.sbt | 3 +++
project/Build.scala | 2 +-
3 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/5e3e181a/bin/kafka-run-class.sh
----------------------------------------------------------------------
diff --git a/bin/kafka-run-class.sh b/bin/kafka-run-class.sh
index e93f670..ec98b33 100755
--- a/bin/kafka-run-class.sh
+++ b/bin/kafka-run-class.sh
@@ -22,12 +22,20 @@ fi
base_dir=$(dirname $0)/..
-for file in $base_dir/project/boot/scala-2.8.0/lib/*.jar;
-do
- CLASSPATH=$CLASSPATH:$file
-done
+library=~/.ivy2/cache/org.scala-lang/scala-library/jars/scala-library-2.8.0.jar
+CLASSPATH=$CLASSPATH:$library
+compiler=~/.ivy2/cache/org.scala-lang/scala-compiler/jars/scala-compiler-2.8.0.jar
+CLASSPATH=$CLASSPATH:$compiler
+log4j=~/.ivy2/cache/log4j/log4j/jars/log4j-1.2.15.jar
+CLASSPATH=$CLASSPATH:$log4j
+slf=~/.ivy2/cache/org.slf4j/slf4j-api/jars/slf4j-api-1.6.4.jar
+CLASSPATH=$CLASSPATH:$slf
+zookeeper=~/.ivy2/cache/org.apache.zookeeper/zookeeper/jars/zookeeper-3.3.4.jar
+CLASSPATH=$CLASSPATH:$zookeeper
+jopt=~/.ivy2//cache/net.sf.jopt-simple/jopt-simple/jars/jopt-simple-3.2.jar
+CLASSPATH=$CLASSPATH:$jopt
-for file in $base_dir/core/target/scala_2.8.0/*.jar;
+for file in $base_dir/core/target/scala-2.8.0/*.jar;
do
CLASSPATH=$CLASSPATH:$file
done
http://git-wip-us.apache.org/repos/asf/kafka/blob/5e3e181a/core/build.sbt
----------------------------------------------------------------------
diff --git a/core/build.sbt b/core/build.sbt
index df58410..211aaf9 100644
--- a/core/build.sbt
+++ b/core/build.sbt
@@ -7,6 +7,8 @@ resolvers ++= Seq(
"SonaType ScalaTest repo" at "https://oss.sonatype.org/content/groups/public/org/scalatest/"
)
+libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ )
+
libraryDependencies ++= Seq(
"org.apache.zookeeper" % "zookeeper" % "3.3.4",
"com.github.sgroschupf" % "zkclient" % "0.1",
@@ -22,3 +24,4 @@ libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) =>
})
}
+
http://git-wip-us.apache.org/repos/asf/kafka/blob/5e3e181a/project/Build.scala
----------------------------------------------------------------------
diff --git a/project/Build.scala b/project/Build.scala
index 44a55f8..eb22bc6 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -34,7 +34,7 @@ object KafkaBuild extends Build {
libraryDependencies ++= Seq(
"log4j" % "log4j" % "1.2.15",
"net.sf.jopt-simple" % "jopt-simple" % "3.2",
- "org.slf4j" % "slf4j-simple" % "latest.release"
+ "org.slf4j" % "slf4j-simple" % "1.6.4"
),
// 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.