Synced sbt and maven builds

This commit is contained in:
Mark Hamstra 2013-08-21 13:50:24 -07:00
parent 53b1c30607
commit ff6f1b0500
4 changed files with 22 additions and 9 deletions

View file

@ -52,6 +52,10 @@
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>

16
pom.xml
View file

@ -71,10 +71,10 @@
<java.version>1.5</java.version> <java.version>1.5</java.version>
<scala.version>2.9.3</scala.version> <scala.version>2.9.3</scala.version>
<mesos.version>0.12.1</mesos.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> <slf4j.version>1.7.2</slf4j.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<hadoop.version>1.2.1</hadoop.version> <hadoop.version>1.0.4</hadoop.version>
<!-- <hadoop.version>2.0.0-mr1-cdh4.1.2</hadoop.version> --> <!-- <hadoop.version>2.0.0-mr1-cdh4.1.2</hadoop.version> -->
<PermGen>64m</PermGen> <PermGen>64m</PermGen>
@ -157,12 +157,17 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
<version>7.5.3.v20111011</version> <version>7.6.8.v20121106</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <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>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -318,7 +323,7 @@
<dependency> <dependency>
<groupId>com.novocode</groupId> <groupId>com.novocode</groupId>
<artifactId>junit-interface</artifactId> <artifactId>junit-interface</artifactId>
<version>0.8</version> <version>0.9</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -437,6 +442,7 @@
<args> <args>
<arg>-unchecked</arg> <arg>-unchecked</arg>
<arg>-optimise</arg> <arg>-optimise</arg>
<arg>-deprecation</arg>
</args> </args>
<jvmArgs> <jvmArgs>
<jvmArg>-Xms64m</jvmArg> <jvmArg>-Xms64m</jvmArg>

View file

@ -134,7 +134,6 @@ object SparkBuild extends Build {
*/ */
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"io.netty" % "netty" % "3.5.3.Final",
"org.eclipse.jetty" % "jetty-server" % "7.6.8.v20121106", "org.eclipse.jetty" % "jetty-server" % "7.6.8.v20121106",
"org.scalatest" %% "scalatest" % "1.9.1" % "test", "org.scalatest" %% "scalatest" % "1.9.1" % "test",
"org.scalacheck" %% "scalacheck" % "1.10.0" % "test", "org.scalacheck" %% "scalacheck" % "1.10.0" % "test",
@ -165,17 +164,15 @@ object SparkBuild extends Build {
name := "spark-core", name := "spark-core",
resolvers ++= Seq( resolvers ++= Seq(
"JBoss Repository" at "http://repository.jboss.org/nexus/content/repositories/releases/", "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/" "Cloudera Repository" at "https://repository.cloudera.com/artifactory/cloudera-repos/"
), ),
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.google.guava" % "guava" % "14.0.1", "com.google.guava" % "guava" % "14.0.1",
"com.google.code.findbugs" % "jsr305" % "1.3.9", "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-api" % slf4jVersion,
"org.slf4j" % "slf4j-log4j12" % slf4jVersion, "org.slf4j" % "slf4j-log4j12" % slf4jVersion,
"commons-daemon" % "commons-daemon" % "1.0.10",
"com.ning" % "compress-lzf" % "0.8.4", "com.ning" % "compress-lzf" % "0.8.4",
"org.xerial.snappy" % "snappy-java" % "1.0.5", "org.xerial.snappy" % "snappy-java" % "1.0.5",
"org.ow2.asm" % "asm" % "4.0", "org.ow2.asm" % "asm" % "4.0",

View file

@ -48,6 +48,12 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.spark-project</groupId>
<artifactId>spark-mllib</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>