From 791ff89e5de73da2a23371290e9cb09ac4496979 Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Tue, 13 Jun 2017 15:33:16 +0200
Subject: [PATCH 01/13] DSP-13218 fix assembling

---
 README.md                          | 2 +-
 java/sbt/dse/build.sbt             | 1 +
 java/sbt/dse/project/assembly.sbt  | 2 +-
 java/sbt/oss/build.sbt             | 1 +
 java/sbt/oss/project/assembly.sbt  | 2 +-
 scala/maven/oss/pom.xml            | 1 +
 scala/sbt/dse/build.sbt            | 7 ++++---
 scala/sbt/dse/project/assembly.sbt | 2 +-
 scala/sbt/oss/build.sbt            | 1 +
 scala/sbt/oss/project/assembly.sbt | 2 +-
 10 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 4706f96..780119f 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ run (Java)   | `dse spark-submit --class com.datastax.spark.example.WriteRead ta
 
 Task                | Command
 --------------------|------------
-build               | `gradle build`
+build               | `gradle shadowJar`
 run (Scala, Java)   | `dse spark-submit --class com.datastax.spark.example.WriteRead build/libs/writeRead-0.1-all.jar`
 
 ### Maven
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index b79c0c9..4eda745 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -18,6 +18,7 @@ libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersio
 //libraryDependencies += "org.apache.commons" % "commons-math3" % "3.6.1"
 //libraryDependencies += "org.apache.commons" % "commons-csv" % "1.0"
 
+assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
 //assemblyShadeRules in assembly := Seq(
 //  ShadeRule.rename("org.apache.commons.csv.**" -> "shaded.org.apache.commons.csv.@1").inAll
 //)
diff --git a/java/sbt/dse/project/assembly.sbt b/java/sbt/dse/project/assembly.sbt
index 39c1bb8..15a88b0 100644
--- a/java/sbt/dse/project/assembly.sbt
+++ b/java/sbt/dse/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
diff --git a/java/sbt/oss/build.sbt b/java/sbt/oss/build.sbt
index a57fc76..4b37334 100644
--- a/java/sbt/oss/build.sbt
+++ b/java/sbt/oss/build.sbt
@@ -22,6 +22,7 @@ libraryDependencies ++= Seq(
 //libraryDependencies += "org.apache.commons" % "commons-math3" % "3.6.1"
 //libraryDependencies += "org.apache.commons" % "commons-csv" % "1.0"
 
+assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
 //assemblyShadeRules in assembly := Seq(
 //  ShadeRule.rename("org.apache.commons.csv.**" -> "shaded.org.apache.commons.csv.@1").inAll
 //)
diff --git a/java/sbt/oss/project/assembly.sbt b/java/sbt/oss/project/assembly.sbt
index 39c1bb8..15a88b0 100644
--- a/java/sbt/oss/project/assembly.sbt
+++ b/java/sbt/oss/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
diff --git a/scala/maven/oss/pom.xml b/scala/maven/oss/pom.xml
index 9ace38b..6ee37c3 100644
--- a/scala/maven/oss/pom.xml
+++ b/scala/maven/oss/pom.xml
@@ -27,6 +27,7 @@
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
       <version>${scala.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index 73b5970..d6a4404 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -21,8 +21,8 @@ libraryDependencies += (
   )
 
 // Test Dependencies
-//The 'test/resources' Directory in  should match the resources directory in the `it` directory
-//for the version of the Spark Cassandra Connector in use.
+// The 'test/resources' Directory in should match the resources directory in the `it` directory
+// for the version of the Spark Cassandra Connector in use.
 val scalaTestVersion = "3.0.0"
 val connectorVersion = "1.6.0"
 val jUnitVersion = "4.12"
@@ -30,7 +30,7 @@ val jUnitVersion = "4.12"
 libraryDependencies ++= Seq(
   "com.datastax.spark" %% "spark-cassandra-connector-embedded" % connectorVersion % "test",
   "org.scalatest" %% "scalatest" % scalaTestVersion % "test",
-  "junit" % "junit" % "4.12"
+  "junit" % "junit" % "4.12" % "test"
 
 ).map(_.excludeAll(
   ExclusionRule("org.slf4j","log4j-over-slf4j"),
@@ -45,6 +45,7 @@ fork in Test := true
 //libraryDependencies += "org.apache.commons" % "commons-math3" % "3.6.1"
 //libraryDependencies += "org.apache.commons" % "commons-csv" % "1.0"
 
+assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
 //assemblyShadeRules in assembly := Seq(
 //  ShadeRule.rename("org.apache.commons.csv.**" -> "shaded.org.apache.commons.csv.@1").inAll
 //)
diff --git a/scala/sbt/dse/project/assembly.sbt b/scala/sbt/dse/project/assembly.sbt
index 39c1bb8..15a88b0 100644
--- a/scala/sbt/dse/project/assembly.sbt
+++ b/scala/sbt/dse/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
diff --git a/scala/sbt/oss/build.sbt b/scala/sbt/oss/build.sbt
index 19aeb6e..124caf2 100644
--- a/scala/sbt/oss/build.sbt
+++ b/scala/sbt/oss/build.sbt
@@ -36,6 +36,7 @@ fork in Test := true
 //libraryDependencies += "org.apache.commons" % "commons-math3" % "3.6.1"
 //libraryDependencies += "org.apache.commons" % "commons-csv" % "1.0"
 
+assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
 //assemblyShadeRules in assembly := Seq(
 //  ShadeRule.rename("org.apache.commons.csv.**" -> "shaded.org.apache.commons.csv.@1").inAll
 //)
diff --git a/scala/sbt/oss/project/assembly.sbt b/scala/sbt/oss/project/assembly.sbt
index 39c1bb8..15a88b0 100644
--- a/scala/sbt/oss/project/assembly.sbt
+++ b/scala/sbt/oss/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")

From 6968dbd77aef75657cb7256e9f2007e44040736b Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Tue, 6 Jun 2017 14:20:17 +0200
Subject: [PATCH 02/13] Move to new artifactory url

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

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index cec5149..82ffca9 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -9,7 +9,7 @@ version '0.1'
 repositories {
     mavenCentral()
     maven {
-        url "https://datastax.artifactoryonline.com/datastax/public-repos/"
+        url "https://repo.datastax.com/public-repos/"
     }
 }
 
diff --git a/java/maven/dse/pom.xml b/java/maven/dse/pom.xml
index 82795d2..b1bf712 100644
--- a/java/maven/dse/pom.xml
+++ b/java/maven/dse/pom.xml
@@ -35,7 +35,7 @@
   <repositories>
     <repository>
       <id>DataStax-Repo</id>
-      <url>https://datastax.artifactoryonline.com/datastax/public-repos/</url>
+      <url>https://repo.datastax.com/public-repos/</url>
     </repository>
   </repositories>
 
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index 4eda745..01b8fbe 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -6,7 +6,7 @@ crossPaths := false
 
 autoScalaLibrary := false
 
-resolvers += "DataStax Repo" at "https://datastax.artifactoryonline.com/datastax/public-repos/"
+resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
 val dseVersion = "5.0.4"
 
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index c44befa..c70986f 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -9,7 +9,7 @@ version '0.1'
 repositories {
     mavenCentral()
     maven {
-        url "https://datastax.artifactoryonline.com/datastax/public-repos/"
+        url "https://repo.datastax.com/public-repos/"
     }
 }
 
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index e9f250b..aaf6f09 100644
--- a/scala/maven/dse/pom.xml
+++ b/scala/maven/dse/pom.xml
@@ -70,7 +70,7 @@
   <repositories>
     <repository>
       <id>DataStax-Repo</id>
-      <url>https://datastax.artifactoryonline.com/datastax/public-repos/</url>
+      <url>https://repo.datastax.com/public-repos/</url>
     </repository>
   </repositories>
 
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index d6a4404..a96d9be 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -5,7 +5,7 @@ version := "0.1"
 
 scalaVersion := "2.10.6"
 
-resolvers += "DataStax Repo" at "https://datastax.artifactoryonline.com/datastax/public-repos/"
+resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
 val dseVersion = "5.0.4"
 

From 80776736ebe2c8234b139d73eeee5a0e76e442fe Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 27 Apr 2017 14:17:38 +0200
Subject: [PATCH 03/13] cleanup fix for 5.0.x branch

---
 .../com/datastax/spark/connector/Cleanup.scala     | 14 ++++++++++++++
 .../com/datastax/spark/example/WriteReadSpec.scala |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 scala/sbt/dse/src/test/scala/com/datastax/spark/connector/Cleanup.scala

diff --git a/scala/sbt/dse/src/test/scala/com/datastax/spark/connector/Cleanup.scala b/scala/sbt/dse/src/test/scala/com/datastax/spark/connector/Cleanup.scala
new file mode 100644
index 0000000..1112f23
--- /dev/null
+++ b/scala/sbt/dse/src/test/scala/com/datastax/spark/connector/Cleanup.scala
@@ -0,0 +1,14 @@
+package com.datastax.spark.connector
+
+import com.datastax.spark.connector.embedded.EmbeddedCassandra
+import com.datastax.spark.connector.util.SerialShutdownHooks
+
+object Cleanup {
+
+  EmbeddedCassandra.removeShutdownHook
+  // now embedded C* won't shutdown itself, let's do it in serial fashion
+  SerialShutdownHooks.add("Shutting down all Cassandra runners")(() => {
+    EmbeddedCassandra.shutdown
+  })
+
+}
diff --git a/scala/sbt/dse/src/test/scala/com/datastax/spark/example/WriteReadSpec.scala b/scala/sbt/dse/src/test/scala/com/datastax/spark/example/WriteReadSpec.scala
index 5864628..8cff7b5 100644
--- a/scala/sbt/dse/src/test/scala/com/datastax/spark/example/WriteReadSpec.scala
+++ b/scala/sbt/dse/src/test/scala/com/datastax/spark/example/WriteReadSpec.scala
@@ -21,6 +21,7 @@ class WriteReadSpec extends FlatSpec with EmbeddedCassandra with SparkTemplate w
   //Sets up CassandraConfig and SparkContext
   useCassandraConfig(Seq("cassandra-default.yaml.template"))
   useSparkConf(defaultConf)
+  Cleanup
 
   val connector = CassandraConnector(defaultConf)
   val ksName = "test"

From 40da1469d6c219a4e10e0406375c9f856cc519d1 Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 27 Apr 2017 15:52:58 +0200
Subject: [PATCH 04/13] 5.0.0 support

---
 java/gradle/dse/build.gradle  | 2 +-
 java/gradle/oss/build.gradle  | 2 +-
 java/maven/dse/pom.xml        | 2 +-
 java/maven/oss/pom.xml        | 2 +-
 java/sbt/dse/build.sbt        | 2 +-
 java/sbt/oss/build.sbt        | 2 +-
 scala/gradle/dse/build.gradle | 2 +-
 scala/gradle/oss/build.gradle | 2 +-
 scala/maven/dse/pom.xml       | 2 +-
 scala/maven/oss/pom.xml       | 2 +-
 scala/sbt/dse/build.sbt       | 2 +-
 scala/sbt/oss/build.sbt       | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 82ffca9..9fbcbf3 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -13,7 +13,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.0.4"
+def dseVersion = "5.0.0"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
diff --git a/java/gradle/oss/build.gradle b/java/gradle/oss/build.gradle
index dc3ff13..473bb72 100644
--- a/java/gradle/oss/build.gradle
+++ b/java/gradle/oss/build.gradle
@@ -10,7 +10,7 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "1.6.2"
+def sparkVersion = "1.6.1"
 def connectorVersion = "1.6.0"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
diff --git a/java/maven/dse/pom.xml b/java/maven/dse/pom.xml
index b1bf712..6c71f3f 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.0.4</dse.version>
+    <dse.version>5.0.0</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/maven/oss/pom.xml b/java/maven/oss/pom.xml
index 7742e80..753e322 100644
--- a/java/maven/oss/pom.xml
+++ b/java/maven/oss/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spark.version>1.6.2</spark.version>
+    <spark.version>1.6.1</spark.version>
     <connector.version>1.6.0</connector.version>
   </properties>
 
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index 01b8fbe..fb048c1 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -8,7 +8,7 @@ autoScalaLibrary := false
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.4"
+val dseVersion = "5.0.0"
 
 // 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/java/sbt/oss/build.sbt b/java/sbt/oss/build.sbt
index 4b37334..1042e21 100644
--- a/java/sbt/oss/build.sbt
+++ b/java/sbt/oss/build.sbt
@@ -6,7 +6,7 @@ crossPaths := false
 
 autoScalaLibrary := false
 
-val sparkVersion = "1.6.2"
+val sparkVersion = "1.6.1"
 val connectorVersion = "1.6.0"
 
 // Please make sure that following dependencies have versions corresponding to the ones in your cluster.
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index c70986f..4960ae9 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -28,7 +28,7 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.0.4"
+def dseVersion = "5.0.0"
 
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
diff --git a/scala/gradle/oss/build.gradle b/scala/gradle/oss/build.gradle
index d09143f..ec578b3 100644
--- a/scala/gradle/oss/build.gradle
+++ b/scala/gradle/oss/build.gradle
@@ -10,7 +10,7 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "1.6.2"
+def sparkVersion = "1.6.1"
 def connectorVersion = "1.6.0"
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index aaf6f09..ea02658 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.0.4</dse.version>
+    <dse.version>5.0.0</dse.version>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
diff --git a/scala/maven/oss/pom.xml b/scala/maven/oss/pom.xml
index 6ee37c3..aae5b0a 100644
--- a/scala/maven/oss/pom.xml
+++ b/scala/maven/oss/pom.xml
@@ -11,7 +11,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
-    <spark.version>1.6.2</spark.version>
+    <spark.version>1.6.1</spark.version>
     <scalatest.version>3.0.0</scalatest.version>
     <connector.version>1.6.0</connector.version>
     <cassandra.version>3.0.2</cassandra.version>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index a96d9be..f3f306b 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.10.6"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.4"
+val dseVersion = "5.0.0"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
diff --git a/scala/sbt/oss/build.sbt b/scala/sbt/oss/build.sbt
index 124caf2..e171b85 100644
--- a/scala/sbt/oss/build.sbt
+++ b/scala/sbt/oss/build.sbt
@@ -4,7 +4,7 @@ version := "0.1"
 
 scalaVersion := "2.10.6"
 
-val sparkVersion = "1.6.2"
+val sparkVersion = "1.6.1"
 val connectorVersion = "1.6.0"
 //The 'test/resources' Directory in  should match the resources directory in the `it` directory
 //for the version of the Spark Cassandra Connector in use.

From ca0c055424a8d7c80dc3205c8cc6067dbcaff24c Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 27 Apr 2017 15:54:15 +0200
Subject: [PATCH 05/13] 5.0.1 support

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

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 9fbcbf3..a851a2e 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -13,7 +13,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.0.0"
+def dseVersion = "5.0.1"
 
 // 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 6c71f3f..d58b89e 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.0.0</dse.version>
+    <dse.version>5.0.1</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index fb048c1..05c68ef 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -8,7 +8,7 @@ autoScalaLibrary := false
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.0"
+val dseVersion = "5.0.1"
 
 // 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 4960ae9..e7629f2 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -28,7 +28,7 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.0.0"
+def dseVersion = "5.0.1"
 
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index ea02658..66c8c3c 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.0.0</dse.version>
+    <dse.version>5.0.1</dse.version>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index f3f306b..383b8ef 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.10.6"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.0"
+val dseVersion = "5.0.1"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing

From e6755b021f415929ffc93ec35a57ce071337952d Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 27 Apr 2017 15:59:10 +0200
Subject: [PATCH 06/13] 5.0.2 support

---
 java/gradle/dse/build.gradle  | 2 +-
 java/gradle/oss/build.gradle  | 2 +-
 java/maven/dse/pom.xml        | 2 +-
 java/maven/oss/pom.xml        | 2 +-
 java/sbt/dse/build.sbt        | 2 +-
 java/sbt/oss/build.sbt        | 2 +-
 scala/gradle/dse/build.gradle | 2 +-
 scala/gradle/oss/build.gradle | 2 +-
 scala/maven/dse/pom.xml       | 2 +-
 scala/maven/oss/pom.xml       | 2 +-
 scala/sbt/dse/build.sbt       | 2 +-
 scala/sbt/oss/build.sbt       | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index a851a2e..03cd38b 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -13,7 +13,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.0.1"
+def dseVersion = "5.0.2"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
diff --git a/java/gradle/oss/build.gradle b/java/gradle/oss/build.gradle
index 473bb72..dc3ff13 100644
--- a/java/gradle/oss/build.gradle
+++ b/java/gradle/oss/build.gradle
@@ -10,7 +10,7 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "1.6.1"
+def sparkVersion = "1.6.2"
 def connectorVersion = "1.6.0"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
diff --git a/java/maven/dse/pom.xml b/java/maven/dse/pom.xml
index d58b89e..ad2faf7 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.0.1</dse.version>
+    <dse.version>5.0.2</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/maven/oss/pom.xml b/java/maven/oss/pom.xml
index 753e322..7742e80 100644
--- a/java/maven/oss/pom.xml
+++ b/java/maven/oss/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spark.version>1.6.1</spark.version>
+    <spark.version>1.6.2</spark.version>
     <connector.version>1.6.0</connector.version>
   </properties>
 
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index 05c68ef..1930e0f 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -8,7 +8,7 @@ autoScalaLibrary := false
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.1"
+val dseVersion = "5.0.2"
 
 // 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/java/sbt/oss/build.sbt b/java/sbt/oss/build.sbt
index 1042e21..4b37334 100644
--- a/java/sbt/oss/build.sbt
+++ b/java/sbt/oss/build.sbt
@@ -6,7 +6,7 @@ crossPaths := false
 
 autoScalaLibrary := false
 
-val sparkVersion = "1.6.1"
+val sparkVersion = "1.6.2"
 val connectorVersion = "1.6.0"
 
 // Please make sure that following dependencies have versions corresponding to the ones in your cluster.
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index e7629f2..cbbdf3e 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -28,7 +28,7 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.0.1"
+def dseVersion = "5.0.2"
 
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
diff --git a/scala/gradle/oss/build.gradle b/scala/gradle/oss/build.gradle
index ec578b3..d09143f 100644
--- a/scala/gradle/oss/build.gradle
+++ b/scala/gradle/oss/build.gradle
@@ -10,7 +10,7 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "1.6.1"
+def sparkVersion = "1.6.2"
 def connectorVersion = "1.6.0"
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index 66c8c3c..4c0993f 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.0.1</dse.version>
+    <dse.version>5.0.2</dse.version>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
diff --git a/scala/maven/oss/pom.xml b/scala/maven/oss/pom.xml
index aae5b0a..6ee37c3 100644
--- a/scala/maven/oss/pom.xml
+++ b/scala/maven/oss/pom.xml
@@ -11,7 +11,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
-    <spark.version>1.6.1</spark.version>
+    <spark.version>1.6.2</spark.version>
     <scalatest.version>3.0.0</scalatest.version>
     <connector.version>1.6.0</connector.version>
     <cassandra.version>3.0.2</cassandra.version>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index 383b8ef..c57ab28 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.10.6"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.1"
+val dseVersion = "5.0.2"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
diff --git a/scala/sbt/oss/build.sbt b/scala/sbt/oss/build.sbt
index e171b85..124caf2 100644
--- a/scala/sbt/oss/build.sbt
+++ b/scala/sbt/oss/build.sbt
@@ -4,7 +4,7 @@ version := "0.1"
 
 scalaVersion := "2.10.6"
 
-val sparkVersion = "1.6.1"
+val sparkVersion = "1.6.2"
 val connectorVersion = "1.6.0"
 //The 'test/resources' Directory in  should match the resources directory in the `it` directory
 //for the version of the Spark Cassandra Connector in use.

From 6be034cebc73cb3e0540d9c163760e6181992449 Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 27 Apr 2017 16:08:50 +0200
Subject: [PATCH 07/13] 5.0.3 support

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

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 03cd38b..6a4ca07 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -13,7 +13,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.0.2"
+def dseVersion = "5.0.3"
 
 // 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 ad2faf7..0ca98af 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.0.2</dse.version>
+    <dse.version>5.0.3</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index 1930e0f..a255d53 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -8,7 +8,7 @@ autoScalaLibrary := false
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.2"
+val dseVersion = "5.0.3"
 
 // 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 cbbdf3e..8f0985b 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -28,7 +28,7 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.0.2"
+def dseVersion = "5.0.3"
 
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index 4c0993f..b27e92b 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.0.2</dse.version>
+    <dse.version>5.0.3</dse.version>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index c57ab28..b37e25c 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.10.6"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.2"
+val dseVersion = "5.0.3"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing

From b401668f705eb9511cca5df9fd9dac631805e5fd Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 27 Apr 2017 16:16:44 +0200
Subject: [PATCH 08/13] 5.0.4 support

---
 java/gradle/dse/build.gradle  |  2 +-
 java/gradle/oss/build.gradle  |  2 +-
 java/maven/dse/pom.xml        |  2 +-
 java/maven/oss/pom.xml        |  2 +-
 java/sbt/dse/build.sbt        |  2 +-
 java/sbt/oss/build.sbt        |  2 +-
 scala/gradle/dse/build.gradle |  4 ++--
 scala/gradle/oss/build.gradle | 10 +++++++---
 scala/maven/dse/pom.xml       |  4 ++--
 scala/maven/oss/pom.xml       | 15 ++++++++++++++-
 scala/sbt/dse/build.sbt       |  4 ++--
 scala/sbt/oss/build.sbt       |  5 +++--
 12 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 6a4ca07..82ffca9 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -13,7 +13,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.0.3"
+def dseVersion = "5.0.4"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
diff --git a/java/gradle/oss/build.gradle b/java/gradle/oss/build.gradle
index dc3ff13..a5b7ab5 100644
--- a/java/gradle/oss/build.gradle
+++ b/java/gradle/oss/build.gradle
@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "1.6.2"
-def connectorVersion = "1.6.0"
+def connectorVersion = "1.6.2"
 
 // 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 0ca98af..b1bf712 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.0.3</dse.version>
+    <dse.version>5.0.4</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/maven/oss/pom.xml b/java/maven/oss/pom.xml
index 7742e80..e50b0af 100644
--- a/java/maven/oss/pom.xml
+++ b/java/maven/oss/pom.xml
@@ -10,7 +10,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spark.version>1.6.2</spark.version>
-    <connector.version>1.6.0</connector.version>
+    <connector.version>1.6.2</connector.version>
   </properties>
 
   <!--
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index a255d53..01b8fbe 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -8,7 +8,7 @@ autoScalaLibrary := false
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.3"
+val dseVersion = "5.0.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/java/sbt/oss/build.sbt b/java/sbt/oss/build.sbt
index 4b37334..f294fc8 100644
--- a/java/sbt/oss/build.sbt
+++ b/java/sbt/oss/build.sbt
@@ -7,7 +7,7 @@ crossPaths := false
 autoScalaLibrary := false
 
 val sparkVersion = "1.6.2"
-val connectorVersion = "1.6.0"
+val connectorVersion = "1.6.2"
 
 // Please make sure that following dependencies have versions corresponding to the ones in your cluster.
 // Note that spark-cassandra-connector should be provided with '--packages' flag to spark-submit command.
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index 8f0985b..216c04b 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -28,11 +28,11 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.0.3"
+def dseVersion = "5.0.4"
 
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
-def connectorVersion = "1.6.0"
+def connectorVersion = "1.6.2"
 def jUnitVersion = "4.12"
 
 // Please make sure that following DSE version matches your DSE cluster version.
diff --git a/scala/gradle/oss/build.gradle b/scala/gradle/oss/build.gradle
index d09143f..fd77f0e 100644
--- a/scala/gradle/oss/build.gradle
+++ b/scala/gradle/oss/build.gradle
@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "1.6.2"
-def connectorVersion = "1.6.0"
+def connectorVersion = "1.6.2"
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
 def cassandraVersion = "3.0.2"
@@ -41,9 +41,13 @@ dependencies {
 //  assembly "org.apache.commons:commons-csv:1.0"
 
     //Test Dependencies
-    testCompile "com.datastax.spark:spark-cassandra-connector-embedded_$scalaVersion:$connectorVersion"
+    testCompile ("com.datastax.spark:spark-cassandra-connector-embedded_$scalaVersion:$connectorVersion") {
+        exclude group: 'com.datastax.cassandra', module: 'cassandra-driver-core'
+    }
     testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
-    testCompile "org.apache.cassandra:cassandra-all:$cassandraVersion"
+    testCompile ("org.apache.cassandra:cassandra-all:$cassandraVersion") {
+        exclude group: 'org.slf4j', module: 'log4j-over-slf4j'  // Excluded to allow for Cassandra to run embedded
+    }
     testCompile "junit:junit:$jUnitVersion"
 }
 
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index b27e92b..48339bf 100644
--- a/scala/maven/dse/pom.xml
+++ b/scala/maven/dse/pom.xml
@@ -9,11 +9,11 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dse.version>5.0.3</dse.version>
+    <dse.version>5.0.4</dse.version>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
-    <connector.version>1.6.0</connector.version>
+    <connector.version>1.6.2</connector.version>
     <junit.version>4.12</junit.version>
   </properties>
 
diff --git a/scala/maven/oss/pom.xml b/scala/maven/oss/pom.xml
index 6ee37c3..8c4d64a 100644
--- a/scala/maven/oss/pom.xml
+++ b/scala/maven/oss/pom.xml
@@ -13,7 +13,7 @@
     <scala.main.version>2.10</scala.main.version>
     <spark.version>1.6.2</spark.version>
     <scalatest.version>3.0.0</scalatest.version>
-    <connector.version>1.6.0</connector.version>
+    <connector.version>1.6.2</connector.version>
     <cassandra.version>3.0.2</cassandra.version>
     <junit.version>4.12</junit.version>
   </properties>
@@ -71,6 +71,12 @@
       <artifactId>spark-cassandra-connector-embedded_${scala.main.version}</artifactId>
       <version>${connector.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.datastax.cassandra</groupId>
+          <artifactId>cassandra-driver-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
@@ -89,6 +95,13 @@
       <artifactId>cassandra-all</artifactId>
       <version>${cassandra.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <!-- Excluded to allow for Cassandra to run embedded -->
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>log4j-over-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- Force Guava 18 on Test CP, Required for Cassandra -->
     <dependency>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index b37e25c..f86626b 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.10.6"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.3"
+val dseVersion = "5.0.4"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
@@ -24,7 +24,7 @@ libraryDependencies += (
 // The 'test/resources' Directory in should match the resources directory in the `it` directory
 // for the version of the Spark Cassandra Connector in use.
 val scalaTestVersion = "3.0.0"
-val connectorVersion = "1.6.0"
+val connectorVersion = "1.6.2"
 val jUnitVersion = "4.12"
 
 libraryDependencies ++= Seq(
diff --git a/scala/sbt/oss/build.sbt b/scala/sbt/oss/build.sbt
index 124caf2..51cde97 100644
--- a/scala/sbt/oss/build.sbt
+++ b/scala/sbt/oss/build.sbt
@@ -5,7 +5,7 @@ version := "0.1"
 scalaVersion := "2.10.6"
 
 val sparkVersion = "1.6.2"
-val connectorVersion = "1.6.0"
+val connectorVersion = "1.6.2"
 //The 'test/resources' Directory in  should match the resources directory in the `it` directory
 //for the version of the Spark Cassandra Connector in use.
 
@@ -23,7 +23,8 @@ libraryDependencies ++= Seq(
   "org.apache.spark" %% "spark-hive" % sparkVersion % "provided",
   "com.datastax.spark" %% "spark-cassandra-connector" % connectorVersion % "provided",
   //Test Dependencies
-  "com.datastax.spark" %% "spark-cassandra-connector-embedded" % connectorVersion % "test",
+  "com.datastax.spark" %% "spark-cassandra-connector-embedded" % connectorVersion % "test"
+    exclude("com.datastax.cassandra", "cassandra-driver-core"),
   "org.scalatest" %% "scalatest" % scalaTestVersion % "test",
   "org.apache.cassandra" % "cassandra-all" % cassandraVersion % "test",
   "junit" % "junit" % jUnitVersion % "test"

From 763d79a198f22c84707962ac8f5a01d96eb103a0 Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Wed, 26 Apr 2017 16:20:31 +0200
Subject: [PATCH 09/13] 5.0.5 support

---
 java/gradle/dse/build.gradle  | 2 +-
 java/gradle/oss/build.gradle  | 4 ++--
 java/maven/dse/pom.xml        | 2 +-
 java/maven/oss/pom.xml        | 2 +-
 java/sbt/dse/build.sbt        | 2 +-
 java/sbt/oss/build.sbt        | 2 +-
 scala/gradle/dse/build.gradle | 6 +++---
 scala/gradle/oss/build.gradle | 4 ++--
 scala/maven/dse/pom.xml       | 4 ++--
 scala/maven/oss/pom.xml       | 2 +-
 scala/sbt/dse/build.sbt       | 4 ++--
 scala/sbt/oss/build.sbt       | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 82ffca9..506b664 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -13,7 +13,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.0.4"
+def dseVersion = "5.0.5"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
diff --git a/java/gradle/oss/build.gradle b/java/gradle/oss/build.gradle
index a5b7ab5..2e1d276 100644
--- a/java/gradle/oss/build.gradle
+++ b/java/gradle/oss/build.gradle
@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "1.6.2"
-def connectorVersion = "1.6.2"
+def connectorVersion = "1.6.3"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
@@ -43,4 +43,4 @@ shadowJar {
 
 //shadowJar {
 //  relocate 'org.apache.commons.csv', 'shaded.org.apache.commons.csv'
-//}
\ No newline at end of file
+//}
diff --git a/java/maven/dse/pom.xml b/java/maven/dse/pom.xml
index b1bf712..60e5bc5 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.0.4</dse.version>
+    <dse.version>5.0.5</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/maven/oss/pom.xml b/java/maven/oss/pom.xml
index e50b0af..d78ee65 100644
--- a/java/maven/oss/pom.xml
+++ b/java/maven/oss/pom.xml
@@ -10,7 +10,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spark.version>1.6.2</spark.version>
-    <connector.version>1.6.2</connector.version>
+    <connector.version>1.6.3</connector.version>
   </properties>
 
   <!--
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index 01b8fbe..08aa6e7 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -8,7 +8,7 @@ autoScalaLibrary := false
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.4"
+val dseVersion = "5.0.5"
 
 // 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/java/sbt/oss/build.sbt b/java/sbt/oss/build.sbt
index f294fc8..a7f0d11 100644
--- a/java/sbt/oss/build.sbt
+++ b/java/sbt/oss/build.sbt
@@ -7,7 +7,7 @@ crossPaths := false
 autoScalaLibrary := false
 
 val sparkVersion = "1.6.2"
-val connectorVersion = "1.6.2"
+val connectorVersion = "1.6.3"
 
 // Please make sure that following dependencies have versions corresponding to the ones in your cluster.
 // Note that spark-cassandra-connector should be provided with '--packages' flag to spark-submit command.
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index 216c04b..40eb24c 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -28,11 +28,11 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.0.4"
+def dseVersion = "5.0.5"
 
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
-def connectorVersion = "1.6.2"
+def connectorVersion = "1.6.3"
 def jUnitVersion = "4.12"
 
 // Please make sure that following DSE version matches your DSE cluster version.
@@ -53,4 +53,4 @@ shadowJar {
 
 //shadowJar {
 //  relocate 'org.apache.commons.csv', 'shaded.org.apache.commons.csv'
-//}
\ No newline at end of file
+//}
diff --git a/scala/gradle/oss/build.gradle b/scala/gradle/oss/build.gradle
index fd77f0e..1dd16cd 100644
--- a/scala/gradle/oss/build.gradle
+++ b/scala/gradle/oss/build.gradle
@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "1.6.2"
-def connectorVersion = "1.6.2"
+def connectorVersion = "1.6.3"
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
 def cassandraVersion = "3.0.2"
@@ -57,4 +57,4 @@ shadowJar {
 
 //shadowJar {
 //  relocate 'org.apache.commons.csv', 'shaded.org.apache.commons.csv'
-//}
\ No newline at end of file
+//}
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index 48339bf..ec821c5 100644
--- a/scala/maven/dse/pom.xml
+++ b/scala/maven/dse/pom.xml
@@ -9,11 +9,11 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dse.version>5.0.4</dse.version>
+    <dse.version>5.0.5</dse.version>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
-    <connector.version>1.6.2</connector.version>
+    <connector.version>1.6.3</connector.version>
     <junit.version>4.12</junit.version>
   </properties>
 
diff --git a/scala/maven/oss/pom.xml b/scala/maven/oss/pom.xml
index 8c4d64a..e601ae1 100644
--- a/scala/maven/oss/pom.xml
+++ b/scala/maven/oss/pom.xml
@@ -13,7 +13,7 @@
     <scala.main.version>2.10</scala.main.version>
     <spark.version>1.6.2</spark.version>
     <scalatest.version>3.0.0</scalatest.version>
-    <connector.version>1.6.2</connector.version>
+    <connector.version>1.6.3</connector.version>
     <cassandra.version>3.0.2</cassandra.version>
     <junit.version>4.12</junit.version>
   </properties>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index f86626b..d7a0039 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.10.6"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.4"
+val dseVersion = "5.0.5"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
@@ -24,7 +24,7 @@ libraryDependencies += (
 // The 'test/resources' Directory in should match the resources directory in the `it` directory
 // for the version of the Spark Cassandra Connector in use.
 val scalaTestVersion = "3.0.0"
-val connectorVersion = "1.6.2"
+val connectorVersion = "1.6.3"
 val jUnitVersion = "4.12"
 
 libraryDependencies ++= Seq(
diff --git a/scala/sbt/oss/build.sbt b/scala/sbt/oss/build.sbt
index 51cde97..383b7c3 100644
--- a/scala/sbt/oss/build.sbt
+++ b/scala/sbt/oss/build.sbt
@@ -5,7 +5,7 @@ version := "0.1"
 scalaVersion := "2.10.6"
 
 val sparkVersion = "1.6.2"
-val connectorVersion = "1.6.2"
+val connectorVersion = "1.6.3"
 //The 'test/resources' Directory in  should match the resources directory in the `it` directory
 //for the version of the Spark Cassandra Connector in use.
 

From cf466bc30fdc58d4760eb132eb0aecbb339b4f65 Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 27 Apr 2017 14:19:01 +0200
Subject: [PATCH 10/13] 5.0.6 support

---
 java/gradle/dse/build.gradle  | 2 +-
 java/gradle/oss/build.gradle  | 4 ++--
 java/maven/dse/pom.xml        | 2 +-
 java/maven/oss/pom.xml        | 4 ++--
 java/sbt/dse/build.sbt        | 2 +-
 java/sbt/oss/build.sbt        | 4 ++--
 scala/gradle/dse/build.gradle | 4 ++--
 scala/gradle/oss/build.gradle | 4 ++--
 scala/maven/dse/pom.xml       | 4 ++--
 scala/maven/oss/pom.xml       | 4 ++--
 scala/sbt/dse/build.sbt       | 4 ++--
 scala/sbt/oss/build.sbt       | 4 ++--
 12 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 506b664..21ebe5f 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -13,7 +13,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.0.5"
+def dseVersion = "5.0.6"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
diff --git a/java/gradle/oss/build.gradle b/java/gradle/oss/build.gradle
index 2e1d276..eef7506 100644
--- a/java/gradle/oss/build.gradle
+++ b/java/gradle/oss/build.gradle
@@ -10,8 +10,8 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "1.6.2"
-def connectorVersion = "1.6.3"
+def sparkVersion = "1.6.3"
+def connectorVersion = "1.6.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 60e5bc5..e9c6caf 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.0.5</dse.version>
+    <dse.version>5.0.6</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/maven/oss/pom.xml b/java/maven/oss/pom.xml
index d78ee65..5237c9f 100644
--- a/java/maven/oss/pom.xml
+++ b/java/maven/oss/pom.xml
@@ -9,8 +9,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spark.version>1.6.2</spark.version>
-    <connector.version>1.6.3</connector.version>
+    <spark.version>1.6.3</spark.version>
+    <connector.version>1.6.4</connector.version>
   </properties>
 
   <!--
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index 08aa6e7..e161c1a 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -8,7 +8,7 @@ autoScalaLibrary := false
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.5"
+val dseVersion = "5.0.6"
 
 // 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/java/sbt/oss/build.sbt b/java/sbt/oss/build.sbt
index a7f0d11..8725b7b 100644
--- a/java/sbt/oss/build.sbt
+++ b/java/sbt/oss/build.sbt
@@ -6,8 +6,8 @@ crossPaths := false
 
 autoScalaLibrary := false
 
-val sparkVersion = "1.6.2"
-val connectorVersion = "1.6.3"
+val sparkVersion = "1.6.3"
+val connectorVersion = "1.6.4"
 
 // Please make sure that following dependencies have versions corresponding to the ones in your cluster.
 // Note that spark-cassandra-connector should be provided with '--packages' flag to spark-submit command.
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index 40eb24c..f9e6ade 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -28,11 +28,11 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.0.5"
+def dseVersion = "5.0.6"
 
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
-def connectorVersion = "1.6.3"
+def connectorVersion = "1.6.4"
 def jUnitVersion = "4.12"
 
 // Please make sure that following DSE version matches your DSE cluster version.
diff --git a/scala/gradle/oss/build.gradle b/scala/gradle/oss/build.gradle
index 1dd16cd..648cea1 100644
--- a/scala/gradle/oss/build.gradle
+++ b/scala/gradle/oss/build.gradle
@@ -10,8 +10,8 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "1.6.2"
-def connectorVersion = "1.6.3"
+def sparkVersion = "1.6.3"
+def connectorVersion = "1.6.4"
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
 def cassandraVersion = "3.0.2"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index ec821c5..2fe3231 100644
--- a/scala/maven/dse/pom.xml
+++ b/scala/maven/dse/pom.xml
@@ -9,11 +9,11 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dse.version>5.0.5</dse.version>
+    <dse.version>5.0.6</dse.version>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
-    <connector.version>1.6.3</connector.version>
+    <connector.version>1.6.4</connector.version>
     <junit.version>4.12</junit.version>
   </properties>
 
diff --git a/scala/maven/oss/pom.xml b/scala/maven/oss/pom.xml
index e601ae1..4f8742b 100644
--- a/scala/maven/oss/pom.xml
+++ b/scala/maven/oss/pom.xml
@@ -11,9 +11,9 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
-    <spark.version>1.6.2</spark.version>
+    <spark.version>1.6.3</spark.version>
     <scalatest.version>3.0.0</scalatest.version>
-    <connector.version>1.6.3</connector.version>
+    <connector.version>1.6.4</connector.version>
     <cassandra.version>3.0.2</cassandra.version>
     <junit.version>4.12</junit.version>
   </properties>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index d7a0039..2a810cc 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.10.6"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.5"
+val dseVersion = "5.0.6"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
@@ -24,7 +24,7 @@ libraryDependencies += (
 // The 'test/resources' Directory in should match the resources directory in the `it` directory
 // for the version of the Spark Cassandra Connector in use.
 val scalaTestVersion = "3.0.0"
-val connectorVersion = "1.6.3"
+val connectorVersion = "1.6.4"
 val jUnitVersion = "4.12"
 
 libraryDependencies ++= Seq(
diff --git a/scala/sbt/oss/build.sbt b/scala/sbt/oss/build.sbt
index 383b7c3..c0ead89 100644
--- a/scala/sbt/oss/build.sbt
+++ b/scala/sbt/oss/build.sbt
@@ -4,8 +4,8 @@ version := "0.1"
 
 scalaVersion := "2.10.6"
 
-val sparkVersion = "1.6.2"
-val connectorVersion = "1.6.3"
+val sparkVersion = "1.6.3"
+val connectorVersion = "1.6.4"
 //The 'test/resources' Directory in  should match the resources directory in the `it` directory
 //for the version of the Spark Cassandra Connector in use.
 

From 6b2f6257a414b46d4468cf5187c360c7bbeda1cd Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 27 Apr 2017 14:34:34 +0200
Subject: [PATCH 11/13] 5.0.7 support

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

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 21ebe5f..d8e1940 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -13,7 +13,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.0.6"
+def dseVersion = "5.0.7"
 
 // 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 e9c6caf..8fb56f5 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.0.6</dse.version>
+    <dse.version>5.0.7</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index e161c1a..df387bb 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -8,7 +8,7 @@ autoScalaLibrary := false
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.6"
+val dseVersion = "5.0.7"
 
 // 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 f9e6ade..8bc67c3 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -28,7 +28,7 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.0.6"
+def dseVersion = "5.0.7"
 
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index 2fe3231..000f7a3 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.0.6</dse.version>
+    <dse.version>5.0.7</dse.version>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index 2a810cc..7a47452 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.10.6"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.6"
+val dseVersion = "5.0.7"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing

From 6eacf2c6a248c880627ce65e1f949a1cc9109de7 Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 27 Apr 2017 15:11:38 +0200
Subject: [PATCH 12/13] 5.0.8 support

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

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index d8e1940..12b3ef3 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -13,7 +13,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.0.7"
+def dseVersion = "5.0.8"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
diff --git a/java/gradle/oss/build.gradle b/java/gradle/oss/build.gradle
index eef7506..8dd37b4 100644
--- a/java/gradle/oss/build.gradle
+++ b/java/gradle/oss/build.gradle
@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "1.6.3"
-def connectorVersion = "1.6.4"
+def connectorVersion = "1.6.5"
 
 // 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 8fb56f5..c4010a4 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.0.7</dse.version>
+    <dse.version>5.0.8</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/maven/oss/pom.xml b/java/maven/oss/pom.xml
index 5237c9f..57c61db 100644
--- a/java/maven/oss/pom.xml
+++ b/java/maven/oss/pom.xml
@@ -10,7 +10,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spark.version>1.6.3</spark.version>
-    <connector.version>1.6.4</connector.version>
+    <connector.version>1.6.5</connector.version>
   </properties>
 
   <!--
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index df387bb..dca6cd6 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -8,7 +8,7 @@ autoScalaLibrary := false
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.7"
+val dseVersion = "5.0.8"
 
 // 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/java/sbt/oss/build.sbt b/java/sbt/oss/build.sbt
index 8725b7b..6323c26 100644
--- a/java/sbt/oss/build.sbt
+++ b/java/sbt/oss/build.sbt
@@ -7,7 +7,7 @@ crossPaths := false
 autoScalaLibrary := false
 
 val sparkVersion = "1.6.3"
-val connectorVersion = "1.6.4"
+val connectorVersion = "1.6.5"
 
 // Please make sure that following dependencies have versions corresponding to the ones in your cluster.
 // Note that spark-cassandra-connector should be provided with '--packages' flag to spark-submit command.
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index 8bc67c3..6007964 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -28,11 +28,12 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.0.7"
+def dseVersion = "5.0.8"
 
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
-def connectorVersion = "1.6.4"
+def connectorVersion = "1.6.5"
+def cassandraVersion = "3.0.2"
 def jUnitVersion = "4.12"
 
 // Please make sure that following DSE version matches your DSE cluster version.
@@ -44,6 +45,7 @@ dependencies {
     //Test Dependencies
     testCompile "com.datastax.spark:spark-cassandra-connector-embedded_$scalaVersion:$connectorVersion"
     testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
+    testCompile "org.apache.cassandra:cassandra-all:$cassandraVersion"
     testCompile "junit:junit:$jUnitVersion"
 }
 
diff --git a/scala/gradle/oss/build.gradle b/scala/gradle/oss/build.gradle
index 648cea1..76b3c9e 100644
--- a/scala/gradle/oss/build.gradle
+++ b/scala/gradle/oss/build.gradle
@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "1.6.3"
-def connectorVersion = "1.6.4"
+def connectorVersion = "1.6.5"
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
 def cassandraVersion = "3.0.2"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index 000f7a3..7cb7dda 100644
--- a/scala/maven/dse/pom.xml
+++ b/scala/maven/dse/pom.xml
@@ -9,11 +9,12 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dse.version>5.0.7</dse.version>
+    <dse.version>5.0.8</dse.version>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
-    <connector.version>1.6.4</connector.version>
+    <connector.version>1.6.5</connector.version>
+    <cassandra.version>3.0.2</cassandra.version>
     <junit.version>4.12</junit.version>
   </properties>
 
@@ -65,6 +66,12 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>cassandra-all</artifactId>
+      <version>${cassandra.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <repositories>
diff --git a/scala/maven/oss/pom.xml b/scala/maven/oss/pom.xml
index 4f8742b..62e9798 100644
--- a/scala/maven/oss/pom.xml
+++ b/scala/maven/oss/pom.xml
@@ -13,7 +13,7 @@
     <scala.main.version>2.10</scala.main.version>
     <spark.version>1.6.3</spark.version>
     <scalatest.version>3.0.0</scalatest.version>
-    <connector.version>1.6.4</connector.version>
+    <connector.version>1.6.5</connector.version>
     <cassandra.version>3.0.2</cassandra.version>
     <junit.version>4.12</junit.version>
   </properties>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index 7a47452..6573d27 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.10.6"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.7"
+val dseVersion = "5.0.8"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
@@ -24,12 +24,14 @@ libraryDependencies += (
 // The 'test/resources' Directory in should match the resources directory in the `it` directory
 // for the version of the Spark Cassandra Connector in use.
 val scalaTestVersion = "3.0.0"
-val connectorVersion = "1.6.4"
+val connectorVersion = "1.6.5"
 val jUnitVersion = "4.12"
+val cassandraVersion = "3.0.2"
 
 libraryDependencies ++= Seq(
   "com.datastax.spark" %% "spark-cassandra-connector-embedded" % connectorVersion % "test",
   "org.scalatest" %% "scalatest" % scalaTestVersion % "test",
+  "org.apache.cassandra" % "cassandra-all" % cassandraVersion % "test",
   "junit" % "junit" % "4.12" % "test"
 
 ).map(_.excludeAll(
diff --git a/scala/sbt/oss/build.sbt b/scala/sbt/oss/build.sbt
index c0ead89..b18a540 100644
--- a/scala/sbt/oss/build.sbt
+++ b/scala/sbt/oss/build.sbt
@@ -5,7 +5,7 @@ version := "0.1"
 scalaVersion := "2.10.6"
 
 val sparkVersion = "1.6.3"
-val connectorVersion = "1.6.4"
+val connectorVersion = "1.6.5"
 //The 'test/resources' Directory in  should match the resources directory in the `it` directory
 //for the version of the Spark Cassandra Connector in use.
 

From d88e2cbfce3733decb2d08fcba9129d98a8caa1b Mon Sep 17 00:00:00 2001
From: Brian Cantoni <brian.cantoni@datastax.com>
Date: Thu, 29 Jun 2017 13:00:16 -0700
Subject: [PATCH 13/13] Update versions for DSE 5.0.9 release

---
 java/gradle/dse/build.gradle  | 2 +-
 java/gradle/oss/build.gradle  | 2 +-
 java/maven/dse/pom.xml        | 2 +-
 java/maven/oss/pom.xml        | 2 +-
 java/sbt/dse/build.sbt        | 2 +-
 java/sbt/oss/build.sbt        | 2 +-
 scala/gradle/dse/build.gradle | 4 ++--
 scala/gradle/oss/build.gradle | 2 +-
 scala/maven/dse/pom.xml       | 4 ++--
 scala/maven/oss/pom.xml       | 2 +-
 scala/sbt/dse/build.sbt       | 4 ++--
 scala/sbt/oss/build.sbt       | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 12b3ef3..678d709 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -13,7 +13,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.0.8"
+def dseVersion = "5.0.9"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
diff --git a/java/gradle/oss/build.gradle b/java/gradle/oss/build.gradle
index 8dd37b4..2b2d6a7 100644
--- a/java/gradle/oss/build.gradle
+++ b/java/gradle/oss/build.gradle
@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "1.6.3"
-def connectorVersion = "1.6.5"
+def connectorVersion = "1.6.7"
 
 // 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 c4010a4..c9fd09a 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.0.8</dse.version>
+    <dse.version>5.0.9</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/maven/oss/pom.xml b/java/maven/oss/pom.xml
index 57c61db..3cb008f 100644
--- a/java/maven/oss/pom.xml
+++ b/java/maven/oss/pom.xml
@@ -10,7 +10,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spark.version>1.6.3</spark.version>
-    <connector.version>1.6.5</connector.version>
+    <connector.version>1.6.7</connector.version>
   </properties>
 
   <!--
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index dca6cd6..7a1772d 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -8,7 +8,7 @@ autoScalaLibrary := false
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.8"
+val dseVersion = "5.0.9"
 
 // 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/java/sbt/oss/build.sbt b/java/sbt/oss/build.sbt
index 6323c26..928c04b 100644
--- a/java/sbt/oss/build.sbt
+++ b/java/sbt/oss/build.sbt
@@ -7,7 +7,7 @@ crossPaths := false
 autoScalaLibrary := false
 
 val sparkVersion = "1.6.3"
-val connectorVersion = "1.6.5"
+val connectorVersion = "1.6.7"
 
 // Please make sure that following dependencies have versions corresponding to the ones in your cluster.
 // Note that spark-cassandra-connector should be provided with '--packages' flag to spark-submit command.
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index 6007964..309cf40 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -28,11 +28,11 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.0.8"
+def dseVersion = "5.0.9"
 
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
-def connectorVersion = "1.6.5"
+def connectorVersion = "1.6.7"
 def cassandraVersion = "3.0.2"
 def jUnitVersion = "4.12"
 
diff --git a/scala/gradle/oss/build.gradle b/scala/gradle/oss/build.gradle
index 76b3c9e..9ac80af 100644
--- a/scala/gradle/oss/build.gradle
+++ b/scala/gradle/oss/build.gradle
@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "1.6.3"
-def connectorVersion = "1.6.5"
+def connectorVersion = "1.6.7"
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
 def cassandraVersion = "3.0.2"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index 7cb7dda..3bf7806 100644
--- a/scala/maven/dse/pom.xml
+++ b/scala/maven/dse/pom.xml
@@ -9,11 +9,11 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dse.version>5.0.8</dse.version>
+    <dse.version>5.0.9</dse.version>
     <scala.version>2.10.6</scala.version>
     <scala.main.version>2.10</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
-    <connector.version>1.6.5</connector.version>
+    <connector.version>1.6.7</connector.version>
     <cassandra.version>3.0.2</cassandra.version>
     <junit.version>4.12</junit.version>
   </properties>
diff --git a/scala/maven/oss/pom.xml b/scala/maven/oss/pom.xml
index 62e9798..ed15463 100644
--- a/scala/maven/oss/pom.xml
+++ b/scala/maven/oss/pom.xml
@@ -13,7 +13,7 @@
     <scala.main.version>2.10</scala.main.version>
     <spark.version>1.6.3</spark.version>
     <scalatest.version>3.0.0</scalatest.version>
-    <connector.version>1.6.5</connector.version>
+    <connector.version>1.6.7</connector.version>
     <cassandra.version>3.0.2</cassandra.version>
     <junit.version>4.12</junit.version>
   </properties>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index 6573d27..6eda0b9 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.10.6"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.0.8"
+val dseVersion = "5.0.9"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
@@ -24,7 +24,7 @@ libraryDependencies += (
 // The 'test/resources' Directory in should match the resources directory in the `it` directory
 // for the version of the Spark Cassandra Connector in use.
 val scalaTestVersion = "3.0.0"
-val connectorVersion = "1.6.5"
+val connectorVersion = "1.6.7"
 val jUnitVersion = "4.12"
 val cassandraVersion = "3.0.2"
 
diff --git a/scala/sbt/oss/build.sbt b/scala/sbt/oss/build.sbt
index b18a540..4424cde 100644
--- a/scala/sbt/oss/build.sbt
+++ b/scala/sbt/oss/build.sbt
@@ -5,7 +5,7 @@ version := "0.1"
 scalaVersion := "2.10.6"
 
 val sparkVersion = "1.6.3"
-val connectorVersion = "1.6.5"
+val connectorVersion = "1.6.7"
 //The 'test/resources' Directory in  should match the resources directory in the `it` directory
 //for the version of the Spark Cassandra Connector in use.