From 3b9fe925d9c60a987dd32000b02b768c5af61498 Mon Sep 17 00:00:00 2001
From: Brian Cantoni <brian.cantoni@datastax.com>
Date: Wed, 6 Sep 2017 15:23:15 -0700
Subject: [PATCH 1/5] Release 5.1.3 support

---
 java/gradle/dse/build.gradle  | 2 +-
 java/gradle/oss/build.gradle  | 2 +-
 java/maven/dse/pom.xml        | 2 +-
 java/maven/oss/pom.xml        | 2 +-
 java/sbt/dse/build.sbt        | 2 +-
 java/sbt/oss/build.sbt        | 2 +-
 scala/gradle/dse/build.gradle | 4 ++--
 scala/gradle/oss/build.gradle | 2 +-
 scala/maven/dse/pom.xml       | 4 ++--
 scala/maven/oss/pom.xml       | 2 +-
 scala/sbt/dse/build.sbt       | 4 ++--
 scala/sbt/oss/build.sbt       | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index c7bf387..58288f8 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -13,7 +13,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.1.2"
+def dseVersion = "5.1.3"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
diff --git a/java/gradle/oss/build.gradle b/java/gradle/oss/build.gradle
index aca2bcc..ceee6a3 100644
--- a/java/gradle/oss/build.gradle
+++ b/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 {
diff --git a/java/maven/dse/pom.xml b/java/maven/dse/pom.xml
index a0aff66..97a965f 100644
--- a/java/maven/dse/pom.xml
+++ b/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</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/maven/oss/pom.xml b/java/maven/oss/pom.xml
index 13fd992..c86adbe 100644
--- a/java/maven/oss/pom.xml
+++ b/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>
 
   <!--
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index f9a768c..f781815 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -10,7 +10,7 @@ scalaVersion := "2.11.8"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.1.2"
+val dseVersion = "5.1.3"
 
 // 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
diff --git a/java/sbt/oss/build.sbt b/java/sbt/oss/build.sbt
index 42776a1..2e2b3f4 100644
--- a/java/sbt/oss/build.sbt
+++ b/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.
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index 3ff197f..274f91e 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -28,11 +28,11 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.1.2"
+def dseVersion = "5.1.3"
 
 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"
 
diff --git a/scala/gradle/oss/build.gradle b/scala/gradle/oss/build.gradle
index dd82e3a..e589dd0 100644
--- a/scala/gradle/oss/build.gradle
+++ b/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"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index 94ca96a..bc4913a 100644
--- a/scala/maven/dse/pom.xml
+++ b/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</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>
diff --git a/scala/maven/oss/pom.xml b/scala/maven/oss/pom.xml
index 219664f..8a29aa5 100644
--- a/scala/maven/oss/pom.xml
+++ b/scala/maven/oss/pom.xml
@@ -13,7 +13,7 @@
     <scala.main.version>2.11</scala.main.version>
     <spark.version>2.0.2</spark.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>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index 8b1cb03..b77e454 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.11.8"
 
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.1.2"
+val dseVersion = "5.1.3"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
@@ -25,7 +25,7 @@ libraryDependencies += (
 // The 'test/resources' Directory in should match the resources directory in the `it` directory
 // for the version of the Spark Cassandra Connector in use.
 val scalaTestVersion = "3.0.0"
-val connectorVersion = "2.0.3"
+val connectorVersion = "2.0.5"
 val jUnitVersion = "4.12"
 val cassandraVersion = "3.2"
 
diff --git a/scala/sbt/oss/build.sbt b/scala/sbt/oss/build.sbt
index e824200..b8626c9 100644
--- a/scala/sbt/oss/build.sbt
+++ b/scala/sbt/oss/build.sbt
@@ -5,7 +5,7 @@ version := "0.1"
 scalaVersion := "2.11.8"
 
 val sparkVersion = "2.0.2"
-val connectorVersion = "2.0.3"
+val connectorVersion = "2.0.5"
 //The 'test/resources' Directory in  should match the resources directory in the `it` directory
 //for the version of the Spark Cassandra Connector in use.
 

From 5a4f4bfdc6ef7cfc81182c273a88ff585f7f24df Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Wed, 27 Sep 2017 12:55:32 +0200
Subject: [PATCH 2/5] Add local maven repo to gradle and sbt builds

This way we can digest published locally maven artifacts (during
integration tests).
---
 java/gradle/dse/build.gradle  | 1 +
 java/sbt/dse/build.sbt        | 1 +
 scala/gradle/dse/build.gradle | 1 +
 scala/sbt/dse/build.sbt       | 1 +
 4 files changed, 4 insertions(+)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 58288f8..35970bb 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/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/"
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index f781815..425d3f9 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -8,6 +8,7 @@ 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.3"
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index 274f91e..305e12e 100644
--- a/scala/gradle/dse/build.gradle
+++ b/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/"
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index b77e454..6aa6a79 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -5,6 +5,7 @@ version := "0.1"
 
 scalaVersion := "2.11.8"
 
+resolvers += Resolver.mavenLocal // for testing
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
 val dseVersion = "5.1.3"

From 45b127904854a05618cd0ed808dd2e88e7e0cf31 Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Tue, 10 Oct 2017 15:11:35 +0200
Subject: [PATCH 3/5] Fix gradle build command in TestAll script

---
 BuildTestAll.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BuildTestAll.sh b/BuildTestAll.sh
index 88c960f..c6264cb 100755
--- a/BuildTestAll.sh
+++ b/BuildTestAll.sh
@@ -12,7 +12,7 @@ test_command () {
         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
 }
 
@@ -20,7 +20,7 @@ for language in "java" "scala"
 do
     echo "### Testing $language Builds### "
     echo "### Gradle ###"
-    test_command "$language/gradle" "gradle -q build"
+    test_command "$language/gradle" "gradle -q shadowJar"
     echo "### SBT ###"
     test_command "$language/sbt" "sbt --error assembly"
     echo "### Maven ###"

From 4a78018ce2d8cb54fd59b725ea96ba7785af2b22 Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Wed, 11 Oct 2017 11:47:51 +0200
Subject: [PATCH 4/5] Turn off sbt output colors

Remove '#' from logging for brevity
---
 BuildTestAll.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/BuildTestAll.sh b/BuildTestAll.sh
index c6264cb..fa990f7 100755
--- a/BuildTestAll.sh
+++ b/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 "### ERROR: $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 ###"
+    echo "Testing $language Builds"
+    echo "Gradle"
     test_command "$language/gradle" "gradle -q shadowJar"
-    echo "### SBT ###"
-    test_command "$language/sbt" "sbt --error assembly"
-    echo "### Maven ###"
+    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

From 22ae1867eca4c37b142adebb01df9c2acaa75b04 Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 12 Oct 2017 15:27:48 +0200
Subject: [PATCH 5/5] Move to fixed spark-dependencies artifact 5.1.3-1

---
 java/gradle/dse/build.gradle  | 2 +-
 java/maven/dse/pom.xml        | 2 +-
 java/sbt/dse/build.sbt        | 2 +-
 scala/gradle/dse/build.gradle | 2 +-
 scala/maven/dse/pom.xml       | 2 +-
 scala/sbt/dse/build.sbt       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index 35970bb..592b166 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -14,7 +14,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.1.3"
+def dseVersion = "5.1.3-1"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
diff --git a/java/maven/dse/pom.xml b/java/maven/dse/pom.xml
index 97a965f..2bdaf92 100644
--- a/java/maven/dse/pom.xml
+++ b/java/maven/dse/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dse.version>5.1.3</dse.version>
+    <dse.version>5.1.3-1</dse.version>
   </properties>
 
   <dependencies>
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index 425d3f9..7b18aac 100644
--- a/java/sbt/dse/build.sbt
+++ b/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 = "5.1.3"
+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
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index 305e12e..5412706 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -29,7 +29,7 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "5.1.3"
+def dseVersion = "5.1.3-1"
 
 def scalaVersion = "2.11"
 def scalaTestVersion = "3.0.0"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index bc4913a..d43024c 100644
--- a/scala/maven/dse/pom.xml
+++ b/scala/maven/dse/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dse.version>5.1.3</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>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index 6aa6a79..951dc92 100644
--- a/scala/sbt/dse/build.sbt
+++ b/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 = "5.1.3"
+val dseVersion = "5.1.3-1"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing