From a350397b395fb994b58a7f2bb248115d0038b996 Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 16 Jan 2020 12:27:52 +0100
Subject: [PATCH] 6.8.0 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       | 5 +++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 91c10ad..a0951c7 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -14,7 +14,7 @@ repositories {
     }
 }
 
-def dseVersion = "6.7.7"
+def dseVersion = "6.8.0"
 
 // 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 a6d1fd9..94eb3f1 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>6.7.7</dse.version>
+    <dse.version>6.8.0</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index 3e98f8b..8d44e67 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 = "6.7.7"
+val dseVersion = "6.8.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/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index 6d44799..567cf75 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 = "6.7.7"
+def dseVersion = "6.8.0"
 
 def scalaVersion = "2.11"
 def scalaTestVersion = "3.0.0"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index 6c4a648..3cb26a2 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>6.7.7</dse.version>
+    <dse.version>6.8.0</dse.version>
     <scala.version>2.11.8</scala.version>
     <scala.main.version>2.11</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 6f54a91..f775731 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -8,7 +8,7 @@ scalaVersion := "2.11.8"
 resolvers += Resolver.mavenLocal // for testing
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "6.7.7"
+val dseVersion = "6.8.0"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
@@ -25,7 +25,8 @@ val jUnitVersion = "4.12"
 val cassandraVersion = "3.2"
 
 libraryDependencies ++= Seq(
-  "com.datastax.spark" %% "spark-cassandra-connector-embedded" % connectorVersion % "test",
+  "com.datastax.spark" %% "spark-cassandra-connector-embedded" % connectorVersion % "test" exclude(
+    "com.datastax.cassandra", "*"),
   "org.apache.cassandra" % "cassandra-all" % cassandraVersion % "test",
   "org.scalatest" %% "scalatest" % scalaTestVersion % "test",
   "junit" % "junit" % "4.12" % "test"