Skip to content

Commit e84a3cb

Browse files
committed
DSP-14970 exclude coliding depenedencies
We rellay on DSE to provide spark, netty and connector
1 parent d8cc221 commit e84a3cb

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

project/Assembly.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object Assembly {
1212
"jetty", "jsp-api-2.0", "antlr", "avro", "slf4j-log4j", "log4j-1.2",
1313
"scala-actors", "commons-cli", "stax-api", "mockito",
1414
// we rely on whatever version DSE has:
15-
"netty", "dse-java-driver").exists(cp.data.getName.startsWith(_))
15+
"spark", "netty", "dse-java-driver").exists(cp.data.getName.startsWith(_))
1616
} },
1717
// We don't need the Scala library, Spark already includes it
1818
assembleArtifact in assemblyPackageScala := false,

project/Dependencies.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ object Dependencies {
3333

3434
lazy val sparkExtraDeps = Seq(
3535
"org.apache.derby" % "derby" % derby % Provided excludeAll(excludeNettyIo, excludeQQ),
36-
"org.apache.hadoop" % "hadoop-client" % hadoop % Provided excludeAll(excludeNettyIo, excludeQQ),
36+
"org.apache.hadoop" % "hadoop-client" % hadoop % Provided
37+
excludeAll(excludeNettyIo, excludeQQ, excludeAsm, excludeServlet),
3738
"com.datastax.spark" %% "spark-mllib" % spark % Provided excludeAll(excludeNettyIo, excludeQQ),
3839
"com.datastax.spark" %% "spark-sql" % spark % Provided excludeAll(excludeNettyIo, excludeQQ),
3940
"com.datastax.spark" %% "spark-streaming" % spark % Provided excludeAll(excludeNettyIo, excludeQQ),
@@ -63,7 +64,8 @@ object Dependencies {
6364

6465

6566
lazy val cassandraDeps = Seq(
66-
"com.datastax.dse" %% "spark-connector" % cassandraConnector
67+
"com.datastax.dse" % "spark-connector" % cassandraConnector % Provided excludeAll(
68+
excludeNettyIo, excludeQQ)
6769
)
6870

6971
lazy val logbackDeps = Seq(

project/ExclusionRules.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ object ExclusionRules {
88
val excludeNettyIo = ExclusionRule(organization = "io.netty")
99
val excludeAsm = ExclusionRule(organization = "asm")
1010
val excludeQQ = ExclusionRule(organization = "org.scalamacros")
11+
val excludeServlet = ExclusionRule(organization = "javax.servlet")
1112
}

0 commit comments

Comments
 (0)