diff options
author | Matei Zaharia <matei.zaharia@gmail.com> | 2013-08-22 10:13:35 -0700 |
---|---|---|
committer | Matei Zaharia <matei.zaharia@gmail.com> | 2013-08-22 10:13:35 -0700 |
commit | 8a36fd09ddedf632e9eae8a8044597ea3f7532d7 (patch) | |
tree | 17a73447b95d60e41fdaf7a56b6bbb2680e445f4 /project | |
parent | c2d00f12e2f3807e4a86ce11703cd216c5b59375 (diff) | |
parent | ff6f1b0500a9a75b61c225f3dc80d4026e98bcd5 (diff) | |
download | spark-8a36fd09ddedf632e9eae8a8044597ea3f7532d7.tar.gz spark-8a36fd09ddedf632e9eae8a8044597ea3f7532d7.tar.bz2 spark-8a36fd09ddedf632e9eae8a8044597ea3f7532d7.zip |
Merge pull request #854 from markhamstra/pomUpdate
Synced sbt and maven builds to use the same dependencies, etc.
Diffstat (limited to 'project')
-rw-r--r-- | project/SparkBuild.scala | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 81080741ca..9d5178dd70 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -134,7 +134,6 @@ object SparkBuild extends Build { */ libraryDependencies ++= Seq( - "io.netty" % "netty" % "3.5.3.Final", "org.eclipse.jetty" % "jetty-server" % "7.6.8.v20121106", "org.scalatest" %% "scalatest" % "1.9.1" % "test", "org.scalacheck" %% "scalacheck" % "1.10.0" % "test", @@ -165,17 +164,15 @@ object SparkBuild extends Build { name := "spark-core", resolvers ++= Seq( "JBoss Repository" at "http://repository.jboss.org/nexus/content/repositories/releases/", - "Spray Repository" at "http://repo.spray.cc/", "Cloudera Repository" at "https://repository.cloudera.com/artifactory/cloudera-repos/" ), libraryDependencies ++= Seq( "com.google.guava" % "guava" % "14.0.1", "com.google.code.findbugs" % "jsr305" % "1.3.9", - "log4j" % "log4j" % "1.2.16", + "log4j" % "log4j" % "1.2.17", "org.slf4j" % "slf4j-api" % slf4jVersion, "org.slf4j" % "slf4j-log4j12" % slf4jVersion, - "commons-daemon" % "commons-daemon" % "1.0.10", "com.ning" % "compress-lzf" % "0.8.4", "org.xerial.snappy" % "snappy-java" % "1.0.5", "org.ow2.asm" % "asm" % "4.0", |