From ce2d2c0976b386678631f4b4a00fe6734f964fcb Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Fri, 13 Oct 2017 13:33:26 +0200
Subject: [PATCH] 5.1.4 support

---
 java/gradle/dse/build.gradle  |  2 +-
 java/maven/dse/pom.xml        |  2 +-
 java/sbt/dse/build.sbt        |  2 +-
 scala/gradle/dse/build.gradle |  7 ++-----
 scala/maven/dse/pom.xml       | 12 +-----------
 scala/sbt/dse/build.sbt       | 11 +++--------
 6 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 592b166..3f7ada7 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -14,7 +14,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.1.3-1"
+def dseVersion = "5.1.4"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
diff --git a/java/maven/dse/pom.xml b/java/maven/dse/pom.xml
index 2bdaf92..e6adc18 100644
--- a/java/maven/dse/pom.xml
+++ b/java/maven/dse/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dse.version>5.1.3-1</dse.version>
+    <dse.version>5.1.4</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index 7b18aac..05a2d8f 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -11,7 +11,7 @@ scalaVersion := "2.11.8"
 resolvers += Resolver.mavenLocal // for testing
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.1.3-1"
+val dseVersion = "5.1.4"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // SBT 0.13.13 or greater required because of a dependency resolution bug
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index 5412706..0262571 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -29,7 +29,7 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.1.3-1"
+def dseVersion = "5.1.4"
 
 def scalaVersion = "2.11"
 def scalaTestVersion = "3.0.0"
@@ -39,10 +39,7 @@ def jUnitVersion = "4.12"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 dependencies {
-    provided("com.datastax.dse:dse-spark-dependencies:$dseVersion") {
-        exclude group: 'org.slf4j', module: 'slf4j-log4j12'
-        exclude group: 'org.apache.cassandra'
-    }
+    provided("com.datastax.dse:dse-spark-dependencies:$dseVersion")
 //  assembly "org.apache.commons:commons-math3:3.6.1"
 //  assembly "org.apache.commons:commons-csv:1.0"
 
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index d43024c..7542b53 100644
--- a/scala/maven/dse/pom.xml
+++ b/scala/maven/dse/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dse.version>5.1.3-1</dse.version>
+    <dse.version>5.1.4</dse.version>
     <scala.version>2.11.8</scala.version>
     <scala.main.version>2.11</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
@@ -24,16 +24,6 @@
       <artifactId>dse-spark-dependencies</artifactId>
       <version>${dse.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.cassandra</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- Your dependencies, 'provided' are not included in jar -->
     <!--<dependency>-->
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index 951dc92..6bce586 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -8,19 +8,14 @@ scalaVersion := "2.11.8"
 resolvers += Resolver.mavenLocal // for testing
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.1.3-1"
+val dseVersion = "5.1.4"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
 // Warning Sbt 0.13.13 or greater is required due to a bug with dependency resolution
 libraryDependencies += (
-  "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" excludeAll (
-      ExclusionRule("org.slf4j","slf4j-log4j12"),
-      ExclusionRule("org.mortbay.jetty"),
-      ExclusionRule("javax.servlet"),
-      ExclusionRule("org.apache.cassandra")
-    )
-  )
+  "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided"
+)
 
 // Test Dependencies
 // The 'test/resources' Directory in should match the resources directory in the `it` directory