DSP-9944: Update Dse Version to 5.0.4

README.md

@@ -62,6 +62,19 @@ Notes:
 1. The above command example are for DSE. To run with open source Spark, use `spark-submit` instead
 2. Also see included example script [BuildTestAll.sh](BuildTestAll.sh) which runs all combinations
 
+
+## Running Integrated Tests
+
+Integrated tests have been set up under a `test` task in each build system. To run
+the tests, invoke the build system and then launch `test`. These tests demonstrate
+how to run integrated embedded Cassandra as well as Local Spark from within your testing
+environment.
+
+Currently only Scala Testing examples are provided.
+
+These tests should also function inside IDEs that are configured with the ability to run
+the build system's tests.
+
 ## Support
 
 The code, examples, and snippets provided in this repository are not "Supported Software" under any DataStax subscriptions or other agreements.

java/gradle/dse/build.gradle

@@ -13,8 +13,7 @@ repositories {
     }
 }
 
-def sparkVersion = "1.6.2"
-def connectorVersion = "1.6.0"
+def dseVersion = "5.0.4"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
@@ -32,7 +31,7 @@ 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:5.0.1"
+    provided "com.datastax.dse:dse-spark-dependencies:$dseVersion"
 //    assembly "org.apache.commons:commons-math3:3.6.1"
 //    assembly "org.apache.commons:commons-csv:1.0"
 }

java/maven/dse/pom.xml

@@ -9,13 +9,14 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <dse.version>5.0.4</dse.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>com.datastax.dse</groupId>
       <artifactId>dse-spark-dependencies</artifactId>
-      <version>5.0.1</version>
+      <version>${dse.version}</version>
       <scope>provided</scope>
     </dependency>
     <!-- Your dependencies, 'provided' are not included in jar -->

java/sbt/dse/build.sbt

@@ -8,8 +8,11 @@ autoScalaLibrary := false
 
 resolvers += "DataStax Repo" at "https://datastax.artifactoryonline.com/datastax/public-repos/"
 
+val dseVersion = "5.0.4"
+
 // Please make sure that following DSE version matches your DSE cluster version.
-libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % "5.0.1" % "provided"
+// SBT 0.13.13 or greater required because of a dependency resolution bug
+libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided"
 
 //Your dependencies
 //libraryDependencies += "org.apache.commons" % "commons-math3" % "3.6.1"

scala/gradle/dse/build.gradle

@@ -13,8 +13,6 @@ repositories {
     }
 }
 
-def sparkVersion = "1.6.2"
-def connectorVersion = "1.6.0"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
@@ -30,19 +28,23 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
+def dseVersion = "5.0.4"
+
 def scalaVersion = "2.10"
-def connectorVersion = "1.6.0"
 def scalaTestVersion = "3.0.0"
+def connectorVersion = "1.6.0"
+def jUnitVersion = "4.12"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 dependencies {
-    provided "com.datastax.dse:dse-spark-dependencies:5.0.1" exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+    provided "com.datastax.dse:dse-spark-dependencies:$dseVersion" exclude group: 'org.slf4j', module: 'slf4j-log4j12'
 //  assembly "org.apache.commons:commons-math3:3.6.1"
 //  assembly "org.apache.commons:commons-csv:1.0"
 
     //Test Dependencies
     testCompile "com.datastax.spark:spark-cassandra-connector-embedded_$scalaVersion:$connectorVersion"
     testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
+    testCompile "junit:junit:$jUnitVersion"
 }
 
 shadowJar {

scala/gradle/oss/build.gradle

@@ -15,6 +15,7 @@ def connectorVersion = "1.6.0"
 def scalaVersion = "2.10"
 def scalaTestVersion = "3.0.0"
 def cassandraVersion = "3.0.2"
+def jUnitVersion = "4.12"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
@@ -43,6 +44,7 @@ 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"
 }
 
 shadowJar {

scala/maven/dse/pom.xml

@@ -9,17 +9,19 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <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>
+    <junit.version>4.12</junit.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>com.datastax.dse</groupId>
       <artifactId>dse-spark-dependencies</artifactId>
-      <version>5.0.1</version>
+      <version>${dse.version}</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -57,6 +59,12 @@
       <version>${scalatest.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <repositories>

scala/maven/oss/pom.xml

@@ -15,6 +15,7 @@
     <scalatest.version>3.0.0</scalatest.version>
     <connector.version>1.6.0</connector.version>
     <cassandra.version>3.0.2</cassandra.version>
+    <junit.version>4.12</junit.version>
   </properties>
 
   <!--
@@ -76,6 +77,12 @@
       <version>${scalatest.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-all</artifactId>

scala/sbt/dse/build.sbt

@@ -7,10 +7,13 @@ scalaVersion := "2.10.6"
 
 resolvers += "DataStax Repo" at "https://datastax.artifactoryonline.com/datastax/public-repos/"
 
+val dseVersion = "5.0.4"
+
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
+// Warning Sbt 0.13.13 or greater is required due to a bug with dependency resolution
 libraryDependencies += (
-  "com.datastax.dse" % "dse-spark-dependencies" % "5.0.1" % "provided" excludeAll (
+  "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" excludeAll (
       ExclusionRule("org.slf4j","slf4j-log4j12"),
       ExclusionRule("org.mortbay.jetty"),
       ExclusionRule("javax.servlet")
@@ -22,11 +25,17 @@ libraryDependencies += (
 //for the version of the Spark Cassandra Connector in use.
 val scalaTestVersion = "3.0.0"
 val connectorVersion = "1.6.0"
+val jUnitVersion = "4.12"
 
 libraryDependencies ++= Seq(
   "com.datastax.spark" %% "spark-cassandra-connector-embedded" % connectorVersion % "test",
-  "org.scalatest" %% "scalatest" % scalaTestVersion % "test"
-).map(_.exclude("org.slf4j","log4j-over-slf4j"))  // Excluded to allow for Cassandra to run embedded
+  "org.scalatest" %% "scalatest" % scalaTestVersion % "test",
+  "junit" % "junit" % "4.12"
+
+).map(_.excludeAll(
+  ExclusionRule("org.slf4j","log4j-over-slf4j"),
+  ExclusionRule("org.slf4j","slf4j-log4j12"))
+)  // Excluded to allow for Cassandra to run embedded
 
 //Forking is required for the Embedded Cassandra
 fork in Test := true

scala/sbt/oss/build.sbt

@@ -12,6 +12,7 @@ val connectorVersion = "1.6.0"
 
 val cassandraVersion = "3.0.2"
 val scalaTestVersion = "3.0.0"
+val jUnitVersion = "4.12"
 
 
 // Please make sure that following dependencies have versions corresponding to the ones in your cluster.
@@ -24,7 +25,8 @@ libraryDependencies ++= Seq(
   //Test Dependencies
   "com.datastax.spark" %% "spark-cassandra-connector-embedded" % connectorVersion % "test",
   "org.scalatest" %% "scalatest" % scalaTestVersion % "test",
-  "org.apache.cassandra" % "cassandra-all" % cassandraVersion % "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
 
 //Forking is required for the Embedded Cassandra