Merge pull request #19 from datastax/5.1.3-master

Release 5.1.3 support

Author: jtgrabowski

BuildTestAll.sh

@@ -9,21 +9,21 @@ failures=""
 test_command () {
     for sys in "dse" "oss"
     do
-        echo "### Testing $1/$sys $2 ###"
+        echo "Testing $1/$sys $2"
         cd $start_location
         cd $1/$sys
-        $2 || { exit_value=$?; echo "### $1/$sys $2 Failed ###"; failures=$failures+"$1/$sys $2 Failed"+$'\n'; }
+        $2 || { exit_value=$?; echo "ERROR: $1/$sys $2 Failed"; failures=$failures+"$1/$sys $2 Failed"+$'\n'; }
     done
 }
 
 for language in "java" "scala"
 do
-    echo "### Testing $language Builds### "
-    echo "### Gradle ###"
-    test_command "$language/gradle" "gradle -q build"
-    echo "### SBT ###"
-    test_command "$language/sbt" "sbt --error assembly"
-    echo "### Maven ###"
+    echo "Testing $language Builds"
+    echo "Gradle"
+    test_command "$language/gradle" "gradle -q shadowJar"
+    echo "SBT"
+    test_command "$language/sbt" "sbt -Dsbt.log.noformat=true --error assembly"
+    echo "Maven"
     test_command "$language/maven" "mvn -q package"
 done
 echo $failures

java/gradle/dse/build.gradle

@@ -7,13 +7,14 @@ group 'com.datastax.spark.example'
 version '0.1'
 
 repositories {
+    mavenLocal() // for testing
     mavenCentral()
     maven {
         url "https://repo.datastax.com/public-repos/"
     }
 }
 
-def dseVersion = "5.1.2"
+def dseVersion = "5.1.3-1"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {

java/gradle/oss/build.gradle

@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "2.0.2"
-def connectorVersion = "2.0.3"
+def connectorVersion = "2.0.5"
 
 // 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>5.1.2</dse.version>
+    <dse.version>5.1.3-1</dse.version>
   </properties>
 
   <dependencies>

java/maven/oss/pom.xml

@@ -10,7 +10,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spark.version>2.0.2</spark.version>
-    <connector.version>2.0.3</connector.version>
+    <connector.version>2.0.5</connector.version>
   </properties>
 
   <!--

java/sbt/dse/build.sbt

@@ -8,9 +8,10 @@ autoScalaLibrary := false
 
 scalaVersion := "2.11.8"
 
+resolvers += Resolver.mavenLocal // for testing
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.1.2"
+val dseVersion = "5.1.3-1"
 
 // 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

java/sbt/oss/build.sbt

@@ -9,7 +9,7 @@ autoScalaLibrary := false
 scalaVersion := "2.11.8"
 
 val sparkVersion = "2.0.2"
-val connectorVersion = "2.0.3"
+val connectorVersion = "2.0.5"
 
 // 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

@@ -7,6 +7,7 @@ group 'com.datastax.spark.example'
 version '0.1'
 
 repositories {
+    mavenLocal() // for testing
     mavenCentral()
     maven {
         url "https://repo.datastax.com/public-repos/"
@@ -28,11 +29,11 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.1.2"
+def dseVersion = "5.1.3-1"
 
 def scalaVersion = "2.11"
 def scalaTestVersion = "3.0.0"
-def connectorVersion = "2.0.3"
+def connectorVersion = "2.0.5"
 def cassandraVersion = "3.2"
 def jUnitVersion = "4.12"
 

scala/gradle/oss/build.gradle

@@ -11,7 +11,7 @@ repositories {
 }
 
 def sparkVersion = "2.0.2"
-def connectorVersion = "2.0.3"
+def connectorVersion = "2.0.5"
 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>5.1.2</dse.version>
+    <dse.version>5.1.3-1</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.3</connector.version>
+    <connector.version>2.0.5</connector.version>
     <cassandra.version>3.2</cassandra.version>
     <junit.version>4.12</junit.version>
   </properties>