Skip to content
Snippets Groups Projects
Commit 213b70a2 authored by Reynold Xin's avatar Reynold Xin
Browse files

Merge pull request #31 from sundeepn/branch-0.8


Resolving package conflicts with hadoop 0.23.9

Hadoop 0.23.9 is having a package conflict with easymock's dependencies.

(cherry picked from commit 023e3fdf)
Signed-off-by: default avatarReynold Xin <rxin@apache.org>
parent d585613e
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,12 @@ class UISuite extends FunSuite { ...@@ -26,7 +26,12 @@ class UISuite extends FunSuite {
test("jetty port increases under contention") { test("jetty port increases under contention") {
val startPort = 4040 val startPort = 4040
val server = new Server(startPort) val server = new Server(startPort)
server.start()
Try { server.start() } match {
case Success(s) =>
case Failure(e) =>
// Either case server port is busy hence setup for test complete
}
val (jettyServer1, boundPort1) = JettyUtils.startJettyServer("localhost", startPort, Seq()) val (jettyServer1, boundPort1) = JettyUtils.startJettyServer("localhost", startPort, Seq())
val (jettyServer2, boundPort2) = JettyUtils.startJettyServer("localhost", startPort, Seq()) val (jettyServer2, boundPort2) = JettyUtils.startJettyServer("localhost", startPort, Seq())
......
...@@ -156,6 +156,7 @@ object SparkBuild extends Build { ...@@ -156,6 +156,7 @@ object SparkBuild extends Build {
*/ */
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"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",
...@@ -178,6 +179,7 @@ object SparkBuild extends Build { ...@@ -178,6 +179,7 @@ object SparkBuild extends Build {
val slf4jVersion = "1.7.2" val slf4jVersion = "1.7.2"
val excludeCglib = ExclusionRule(organization = "org.sonatype.sisu.inject")
val excludeJackson = ExclusionRule(organization = "org.codehaus.jackson") val excludeJackson = ExclusionRule(organization = "org.codehaus.jackson")
val excludeNetty = ExclusionRule(organization = "org.jboss.netty") val excludeNetty = ExclusionRule(organization = "org.jboss.netty")
val excludeAsm = ExclusionRule(organization = "asm") val excludeAsm = ExclusionRule(organization = "asm")
...@@ -210,7 +212,7 @@ object SparkBuild extends Build { ...@@ -210,7 +212,7 @@ object SparkBuild extends Build {
"org.apache.mesos" % "mesos" % "0.13.0", "org.apache.mesos" % "mesos" % "0.13.0",
"io.netty" % "netty-all" % "4.0.0.Beta2", "io.netty" % "netty-all" % "4.0.0.Beta2",
"org.apache.derby" % "derby" % "10.4.2.0" % "test", "org.apache.derby" % "derby" % "10.4.2.0" % "test",
"org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm), "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
"net.java.dev.jets3t" % "jets3t" % "0.7.1", "net.java.dev.jets3t" % "jets3t" % "0.7.1",
"org.apache.avro" % "avro" % "1.7.4", "org.apache.avro" % "avro" % "1.7.4",
"org.apache.avro" % "avro-ipc" % "1.7.4" excludeAll(excludeNetty), "org.apache.avro" % "avro-ipc" % "1.7.4" excludeAll(excludeNetty),
...@@ -248,6 +250,7 @@ object SparkBuild extends Build { ...@@ -248,6 +250,7 @@ object SparkBuild extends Build {
exclude("log4j","log4j") exclude("log4j","log4j")
exclude("org.apache.cassandra.deps", "avro") exclude("org.apache.cassandra.deps", "avro")
excludeAll(excludeSnappy) excludeAll(excludeSnappy)
excludeAll(excludeCglib)
) )
) ++ assemblySettings ++ extraAssemblySettings ) ++ assemblySettings ++ extraAssemblySettings
...@@ -290,10 +293,10 @@ object SparkBuild extends Build { ...@@ -290,10 +293,10 @@ object SparkBuild extends Build {
def yarnEnabledSettings = Seq( def yarnEnabledSettings = Seq(
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
// Exclude rule required for all ? // Exclude rule required for all ?
"org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm), "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
"org.apache.hadoop" % "hadoop-yarn-api" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm), "org.apache.hadoop" % "hadoop-yarn-api" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
"org.apache.hadoop" % "hadoop-yarn-common" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm), "org.apache.hadoop" % "hadoop-yarn-common" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
"org.apache.hadoop" % "hadoop-yarn-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm) "org.apache.hadoop" % "hadoop-yarn-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib)
) )
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment