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 | |
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.
-rw-r--r-- | core/pom.xml | 4 | ||||
-rw-r--r-- | pom.xml | 14 | ||||
-rw-r--r-- | project/SparkBuild.scala | 5 | ||||
-rw-r--r-- | repl/pom.xml | 6 |
4 files changed, 21 insertions, 8 deletions
diff --git a/core/pom.xml b/core/pom.xml index 6627a87de1..3d70a19584 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -53,6 +53,10 @@ <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> @@ -71,7 +71,7 @@ <java.version>1.5</java.version> <scala.version>2.9.3</scala.version> <mesos.version>0.12.1</mesos.version> - <akka.version>2.0.3</akka.version> + <akka.version>2.0.5</akka.version> <slf4j.version>1.7.2</slf4j.version> <log4j.version>1.2.17</log4j.version> <hadoop.version>1.0.4</hadoop.version> @@ -157,12 +157,17 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>7.5.3.v20111011</version> + <version>7.6.8.v20121106</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>11.0.1</version> + <version>14.0.1</version> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>1.3.9</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -318,7 +323,7 @@ <dependency> <groupId>com.novocode</groupId> <artifactId>junit-interface</artifactId> - <version>0.8</version> + <version>0.9</version> <scope>test</scope> </dependency> <dependency> @@ -437,6 +442,7 @@ <args> <arg>-unchecked</arg> <arg>-optimise</arg> + <arg>-deprecation</arg> </args> <jvmArgs> <jvmArg>-Xms64m</jvmArg> 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", diff --git a/repl/pom.xml b/repl/pom.xml index 5bc9a99c5c..f800664cff 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -49,6 +49,12 @@ <scope>runtime</scope> </dependency> <dependency> + <groupId>org.spark-project</groupId> + <artifactId>spark-mllib</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> </dependency> |