From a6dd0986e72b4491c2176f784557f3de5df5a45e Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Thu, 23 Sep 2010 10:27:05 +0200 Subject: [PATCH] Removing log4j and making Jetty intransitive --- project/build/AkkaProject.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 28360f155b..8926799556 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -228,8 +228,7 @@ 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 log4j = "log4j" % "log4j" % "1.2.15" % "test" - lazy val jett_mortbay = "org.mortbay.jetty" % "jetty" % "6.1.14" % "test" + lazy val jett_mortbay = "org.mortbay.jetty" % "jetty" % "6.1.14" % "test" intransitive() } // ------------------------------------------------------------------------------------------------------------------- @@ -539,7 +538,6 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { val hadoop_test = Dependencies.hadoop_test val hbase_test = Dependencies.hbase_test val jetty = Dependencies.jett_mortbay - val log4j = Dependencies.log4j override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil }