Skip to content

SPARK-1949. Servlet 2.5 vs 3.0 conflict in SBT build #906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
srowen wants to merge 1 commit into from
+5 −4
Closed

SPARK-1949. Servlet 2.5 vs 3.0 conflict in SBT build #906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ object SparkBuild extends Build {
val excludeJBossNetty = ExclusionRule(organization = "org.jboss.netty")
val excludeIONetty = ExclusionRule(organization = "io.netty")
val excludeEclipseJetty = ExclusionRule(organization = "org.eclipse.jetty")
val excludeMortbayJetty = ExclusionRule(organization = "org.mortbay.jetty")
val excludeAsm = ExclusionRule(organization = "org.ow2.asm")
val excludeOldAsm = ExclusionRule(organization = "asm")
val excludeCommonsLogging = ExclusionRule(organization = "commons-logging")
Expand Down Expand Up @@ -371,7 +372,7 @@ object SparkBuild extends Build {
"net.java.dev.jets3t" % "jets3t" % jets3tVersion excludeAll(excludeCommonsLogging),
"commons-codec" % "commons-codec" % "1.5", // Prevent jets3t from including the older version of commons-codec
"org.apache.derby" % "derby" % "10.4.2.0" % "test",
"org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeCommonsLogging, excludeSLF4J, excludeOldAsm, excludeServletApi),
"org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJBossNetty, excludeMortbayJetty, excludeAsm, excludeCommonsLogging, excludeSLF4J, excludeOldAsm, excludeServletApi),
"org.apache.curator" % "curator-recipes" % "2.4.0" excludeAll(excludeJBossNetty),
"com.codahale.metrics" % "metrics-core" % codahaleMetricsVersion,
"com.codahale.metrics" % "metrics-jvm" % codahaleMetricsVersion,
Expand Down Expand Up @@ -528,9 +529,9 @@ object SparkBuild extends Build {
name := "spark-hive",
javaOptions += "-XX:MaxPermSize=1g",
libraryDependencies ++= Seq(
"org.spark-project.hive" % "hive-metastore" % hiveVersion,
"org.spark-project.hive" % "hive-exec" % hiveVersion excludeAll(excludeCommonsLogging),
"org.spark-project.hive" % "hive-serde" % hiveVersion
"org.spark-project.hive" % "hive-metastore" % hiveVersion excludeAll(excludeJBossNetty, excludeMortbayJetty, excludeCommonsLogging, excludeSLF4J),
"org.spark-project.hive" % "hive-exec" % hiveVersion excludeAll(excludeJBossNetty, excludeMortbayJetty, excludeCommonsLogging, excludeSLF4J),
"org.spark-project.hive" % "hive-serde" % hiveVersion excludeAll(excludeJBossNetty, excludeMortbayJetty, excludeCommonsLogging, excludeSLF4J)
),
// Multiple queries rely on the TestHive singleton. See comments there for more details.
parallelExecution in Test := false,
Expand Down