6.0.2 support

Note the extra exclusion and two additional classes. These dummy classes need to be added in test scope.

Author: jtgrabowski

java/gradle/dse/build.gradle

@@ -14,7 +14,7 @@ repositories {
  }
 }
 
-def dseVersion = "6.0.1"
+def dseVersion = "6.0.2"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
@@ -32,7 +32,9 @@ configurations {
 // 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.
 dependencies {
- provided "com.datastax.dse:dse-spark-dependencies:$dseVersion"
+ provided ("com.datastax.dse:dse-spark-dependencies:$dseVersion") {
+ exclude group: 'com.datastax.dse', module: 'dse-db'
+ }
 // assembly "org.apache.commons:commons-math3:3.6.1"
 // assembly "org.apache.commons:commons-csv:1.0"
 }

java/gradle/oss/build.gradle

@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "2.2.1"
-def connectorVersion = "2.0.7"
+def connectorVersion = "2.0.9"
 
 // 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.0.1</dse.version>
+ <dse.version>6.0.2</dse.version>
  </properties>
 
  <dependencies>
@@ -18,6 +18,12 @@
  <artifactId>dse-spark-dependencies</artifactId>
  <version>${dse.version}</version>
  <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.datastax.dse</groupId>
+ <artifactId>dse-db</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <!-- Your dependencies, 'provided' are not included in jar -->
  <!--<dependency>-->

java/maven/oss/pom.xml

@@ -10,7 +10,7 @@
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <spark.version>2.2.1</spark.version>
- <connector.version>2.0.7</connector.version>
+ <connector.version>2.0.9</connector.version>
  </properties>
 
  <!--

java/sbt/dse/build.sbt

@@ -11,11 +11,12 @@ scalaVersion := "2.11.8"
 resolvers += Resolver.mavenLocal // for testing
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "6.0.1"
+val dseVersion = "6.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
-libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided"
+libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" exclude(
+ "com.datastax.dse", "dse-db")
 
 //Your dependencies
 //libraryDependencies += "org.apache.commons" % "commons-math3" % "3.6.1"

java/sbt/oss/build.sbt

@@ -9,7 +9,7 @@ autoScalaLibrary := false
 scalaVersion := "2.11.8"
 
 val sparkVersion = "2.2.1"
-val connectorVersion = "2.0.7"
+val connectorVersion = "2.0.9"
 
 // 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.

scala/gradle/dse/build.gradle

@@ -29,17 +29,19 @@ configurations {
  testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "6.0.1"
+def dseVersion = "6.0.2"
 
 def scalaVersion = "2.11"
 def scalaTestVersion = "3.0.0"
-def connectorVersion = "2.0.7"
+def connectorVersion = "2.0.9"
 def cassandraVersion = "3.2"
 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")
+ provided("com.datastax.dse:dse-spark-dependencies:$dseVersion") {
+ exclude group: 'com.datastax.dse', module: 'dse-db'
+ }
 // assembly "org.apache.commons:commons-math3:3.6.1"
 // assembly "org.apache.commons:commons-csv:1.0"
 

scala/gradle/oss/build.gradle

@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "2.2.1"
-def connectorVersion = "2.0.7"
+def connectorVersion = "2.0.9"
 def scalaVersion = "2.11"
 def scalaTestVersion = "3.0.0"
 def cassandraVersion = "3.2"

scala/maven/dse/pom.xml

@@ -9,11 +9,11 @@
 
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <dse.version>6.0.1</dse.version>
+ <dse.version>6.0.2</dse.version>
  <scala.version>2.11.8</scala.version>
  <scala.main.version>2.11</scala.main.version>
  <scalatest.version>3.0.0</scalatest.version>
- <connector.version>2.0.7</connector.version>
+ <connector.version>2.0.9</connector.version>
  <cassandra.version>3.2</cassandra.version>
  <junit.version>4.12</junit.version>
  </properties>
@@ -24,7 +24,21 @@
  <artifactId>dse-spark-dependencies</artifactId>
  <version>${dse.version}</version>
  <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.datastax.dse</groupId>
+ <artifactId>dse-db</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
+
+ <!--<dependency>-->
+ <!--<groupId>com.datastax.dse</groupId>-->
+ <!--<artifactId>dse-byos_2.11</artifactId>-->
+ <!--<version>${dse.version}</version>-->
+ <!--<scope>provided</scope>-->
+ <!--</dependency>-->
+
  <!-- Your dependencies, 'provided' are not included in jar -->
  <!--<dependency>-->
  <!--<groupId>org.apache.commons</groupId>-->

scala/maven/oss/pom.xml

@@ -13,7 +13,7 @@
  <scala.main.version>2.11</scala.main.version>
  <spark.version>2.2.1</spark.version>
  <scalatest.version>3.0.0</scalatest.version>
- <connector.version>2.0.7</connector.version>
+ <connector.version>2.0.9</connector.version>
  <cassandra.version>3.2</cassandra.version>
  <junit.version>4.12</junit.version>
  </properties>