raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'master' into new_master

Browse source
This commit is contained in:
Viktor Klang 2010-09-23 13:33:41 +02:00
commit e433955cc0
1 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
project/build/AkkaProject.scala
View file

@ -230,7 +230,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val scalatest = "org.scalatest" % "scalatest" % SCALATEST_VERSION % "test"
lazy val hadoop_test = "org.apache.hadoop" % "hadoop-test" % "0.20.2" % "test"
lazy val hbase_test = "org.apache.hbase" % "hbase-test" % "0.20.6" % "test"
lazy val jett_mortbay = "org.mortbay.jetty" % "jetty" % "6.1.14" % "test" intransitive()
lazy val log4j = "log4j" % "log4j" % "1.2.15" % "test"
lazy val jetty_mortbay = "org.mortbay.jetty" % "jetty" % "6.1.14" % "test"
}
// -------------------------------------------------------------------------------------------------------------------
@ -533,14 +534,25 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
// -------------------------------------------------------------------------------------------------------------------
class AkkaHbaseProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
val zookeeper = Dependencies.zookeeper
val hadoop_core = Dependencies.hadoop_core
val hbase_core = Dependencies.hbase_core
// testing
val hadoop_test = Dependencies.hadoop_test
val hbase_test = Dependencies.hbase_test
val jetty = Dependencies.jett_mortbay
override def ivyXML =
<dependencies>
<dependency org="org.apache.hadoop.zookeeper" name="zookeeper" rev="3.2.2" conf="compile">
</dependency>
<dependency org="org.apache.hadoop" name="hadoop-core" rev="0.20.2" conf="compile">
</dependency>
<dependency org="org.apache.hbase" name="hbase-core" rev="0.20.6" conf="compile">
</dependency>
<dependency org="org.apache.hadoop" name="hadoop-test" rev="0.20.2" conf="test">
<exclude module="slf4j-api"/>
</dependency>
<dependency org="org.apache.hbase" name="hbase-test" rev="0.20.6" conf="test">
</dependency>
<dependency org="log4j" name="log4j" rev="1.2.15" conf="test">
</dependency>
<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.14" conf="test">
</dependency>
</dependencies>
override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil
}