Merge branch 'b2.4'

Author: RussellSpitzer

project/Versions.scala

@@ -25,7 +25,7 @@ object Versions {
 
   val Akka            = "2.3.4"
   val Cassandra       = "3.11.3"
-  val CassandraDriver = "3.1.4"
+  val CassandraDriver = "3.7.2"
   val CommonsIO       = "2.4"
   val CommonsLang3    = "3.3.2"
   val CommonsBeanUtils= "1.9.3"

spark-cassandra-connector-embedded/src/main/scala/com/datastax/spark/connector/embedded/YamlTransformations.scala

@@ -47,11 +47,11 @@ object YamlTransformations {
 
   private def readTemplate(): JMap[String, AnyRef]@unchecked = {
     val exactTmplt =
-      Option(ClassLoader.getSystemResourceAsStream(s"cassandra-$YamlTemplateVersion.yaml.template"))
+      Option(getClass.getResourceAsStream(s"/cassandra-$YamlTemplateVersion.yaml.template"))
     lazy val fallbackTmplt = {
       System.err.println(s"Warning: Using fallback template for Cassandra 3.2 because " +
         s"the template for Cassandra $YamlTemplateVersion could not be found.")
-      Option(ClassLoader.getSystemResourceAsStream(s"cassandra-3.2.yaml.template"))
+      Option(getClass.getResourceAsStream(s"/cassandra-3.2.yaml.template"))
     }
 
     yaml.load(exactTmplt orElse fallbackTmplt orNull) match {

spark-cassandra-connector/src/main/scala/com/datastax/driver/core/PreparedIdWorkaround.scala

@@ -9,7 +9,7 @@ package com.datastax.driver.core
 object PreparedIdWorkaround {
 
   def getResultMetadata(preparedId: PreparedId) = {
-    preparedId.resultSetMetadata
+    preparedId.resultSetMetadata.variables
   }
 
 }

spark-cassandra-connector/src/main/scala/com/datastax/spark/connector/CassandraRow.scala

@@ -132,7 +132,7 @@ object CassandraRowMetadata {
   }
 
   def fromPreparedId(columnNames: IndexedSeq[String], ps: PreparedId) = {
-    fromColumnDefs(columnNames, PreparedIdWorkaround.getResultMetadata(ps).asList())
+    fromColumnDefs(columnNames, PreparedIdWorkaround.getResultMetadata(ps).asList)
   }
 
   private def fromColumnDefs(columnNames: IndexedSeq[String], columnDefs: java.util.List[Definition]) = {