DSP-12329 bump spark/connector versions for OSS

also remove cassandra-driver-core dependency from
spark-cassandra-connector-embedded as it conflicts with the one embedded
in spark-cassandra-connector

Author: jtgrabowski

README.md

@@ -43,7 +43,7 @@ application's jar. All you need to do is add dependencies in the build configura
 
 Task         | Command
 -------------|------------
-build        | `sbt assembly`
+build        | `sbt clean assembly`
 run (Scala)  | `dse spark-submit --class com.datastax.spark.example.WriteRead target/scala-2.10/writeRead-assembly-0.1.jar`
 run (Java)   | `dse spark-submit --class com.datastax.spark.example.WriteRead target/writeRead-assembly-0.1.jar`
 

java/gradle/oss/build.gradle

@@ -10,8 +10,8 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "1.6.2"
-def connectorVersion = "1.6.0"
+def sparkVersion = "2.0.0"
+def connectorVersion = "2.0.0-M3"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {

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.0</connector.version>
+    <spark.version>2.0.0</spark.version>
+    <connector.version>2.0.0-M3</connector.version>
   </properties>
 
   <!--

java/sbt/oss/build.sbt

@@ -6,8 +6,10 @@ crossPaths := false
 
 autoScalaLibrary := false
 
-val sparkVersion = "1.6.2"
-val connectorVersion = "1.6.0"
+scalaVersion := "2.11.8"
+
+val sparkVersion = "2.0.0"
+val connectorVersion = "2.0.0-M3"
 
 // 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/oss/build.gradle

@@ -10,9 +10,9 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "1.6.2"
-def connectorVersion = "1.6.0"
-def scalaVersion = "2.10"
+def sparkVersion = "2.0.0"
+def connectorVersion = "2.0.0-M3"
+def scalaVersion = "2.11"
 def scalaTestVersion = "3.0.0"
 def cassandraVersion = "3.0.2"
 def jUnitVersion = "4.12"
@@ -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"
 }
 

scala/maven/oss/pom.xml

@@ -9,11 +9,11 @@
 
   <properties>
     <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>
+    <scala.version>2.11.8</scala.version>
+    <scala.main.version>2.11</scala.main.version>
+    <spark.version>2.0.0</spark.version>
     <scalatest.version>3.0.0</scalatest.version>
-    <connector.version>1.6.0</connector.version>
+    <connector.version>2.0.0-M3</connector.version>
     <cassandra.version>3.0.2</cassandra.version>
     <junit.version>4.12</junit.version>
   </properties>
@@ -70,6 +70,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>
@@ -88,6 +94,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>

scala/sbt/oss/build.sbt

@@ -2,10 +2,10 @@ name := "writeRead"
 
 version := "0.1"
 
-scalaVersion := "2.10.6"
+scalaVersion := "2.11.8"
 
-val sparkVersion = "1.6.2"
-val connectorVersion = "1.6.0"
+val sparkVersion = "2.0.0"
+val connectorVersion = "2.0.0-M3"
 //The 'test/resources' Directory in  should match the resources directory in the `it` directory
 //for the version of the Spark Cassandra Connector in use.
 
@@ -22,12 +22,14 @@ libraryDependencies ++= Seq(
   "org.apache.spark" %% "spark-sql" % sparkVersion % "provided",
   "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"
-).map(_.exclude("org.slf4j","log4j-over-slf4j"))  // Excluded to allow for Cassandra to run embedded
+).map(_.exclude("org.slf4j", "log4j-over-slf4j"))  // Excluded to allow for Cassandra to run embedded
 
 //Forking is required for the Embedded Cassandra
 fork in Test := true