Merge pull request #42 from datastax/6.8.0-support

6.8.0 support

Author: jtgrabowski

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 {

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>

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

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"

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>

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"