Merge pull request #33 from datastax/6.0.2-support

Jacek Lewandowski · web-flow · commit da9e90cea0d4 · 2018-07-24T14:03:40.000+02:00
6.0.2 support
diff --git a/java/gradle/dse/build.gradle b/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 {
diff --git a/java/gradle/oss/build.gradle b/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 {
diff --git 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>6.0.1</dse.version>
+    <dse.version>6.0.2</dse.version>
   </properties>
 
   <dependencies>
diff --git 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.2.1</spark.version>
-    <connector.version>2.0.7</connector.version>
+    <connector.version>2.0.9</connector.version>
   </properties>
 
   <!--
diff --git 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 = "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
diff --git 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.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.
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
@@ -29,11 +29,11 @@ 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"
 
diff --git a/scala/gradle/oss/build.gradle b/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"
diff --git 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>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>
diff --git 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.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>
diff --git 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 = "6.0.1"
+val dseVersion = "6.0.2"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
@@ -20,7 +20,7 @@ libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersio
 // 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.7"
+val connectorVersion = "2.0.9"
 val jUnitVersion = "4.12"
 val cassandraVersion = "3.2"
 
diff --git 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.2.1"
-val connectorVersion = "2.0.7"
+val connectorVersion = "2.0.9"
 //The 'test/resources' Directory in  should match the resources directory in the `it` directory
 //for the version of the Spark Cassandra Connector in use.
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ repositories {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-def dseVersion = "6.0.1"`
	`17`	`+def dseVersion = "6.0.2"`
`18`	`18`
`19`	`19`	`// The assembly configuration will cause jar to be included in assembled fat-jar`
`20`	`20`	`configurations {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ repositories {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`def sparkVersion = "2.2.1"`
`14`		`-def connectorVersion = "2.0.7"`
	`14`	`+def connectorVersion = "2.0.9"`
`15`	`15`
`16`	`16`	`// The assembly configuration will cause jar to be included in assembled fat-jar`
`17`	`17`	`configurations {`