Merge pull request #1299 from msmygit/b2.5

SPARKC-640 Upgrade Java Driver to 4.10.0

Author: jtgrabowski

.travis.yml

@@ -28,11 +28,13 @@ env:
     - TEST_PARALLEL_TASKS=1 #Times out on 2
 
   jobs:
-    - CCM_CASSANDRA_VERSION=3.11.6
+    - CCM_CASSANDRA_VERSION=3.11.9
     - CCM_CASSANDRA_VERSION=3.0.20
+    - CCM_CASSANDRA_VERSION=4.0-beta4
     - CCM_CASSANDRA_VERSION=2.1.21
-    - CCM_CASSANDRA_VERSION=6.0.11 CCM_IS_DSE=true DSE_VERSION=6.0.11 CCM_SERVER_TYPE=dse
-    - CCM_CASSANDRA_VERSION=6.8.5  CCM_IS_DSE=true DSE_VERSION=6.8.5 CCM_SERVER_TYPE=dse
+    - CCM_CASSANDRA_VERSION=6.0.14 CCM_IS_DSE=true DSE_VERSION=6.0.14 CCM_SERVER_TYPE=dse
+    - CCM_CASSANDRA_VERSION=6.7.12 CCM_IS_DSE=true DSE_VERSION=6.7.12 CCM_SERVER_TYPE=dse
+    - CCM_CASSANDRA_VERSION=6.8.9 CCM_IS_DSE=true DSE_VERSION=6.8.9 CCM_SERVER_TYPE=dse
 
 install:
   - pip install --user ccm

driver/src/main/scala/com/datastax/spark/connector/cql/LocalNodeFirstLoadBalancingPolicy.scala

@@ -15,7 +15,7 @@ import com.datastax.oss.driver.api.core.session.{Request, Session}
 import com.datastax.oss.driver.internal.core.context.InternalDriverContext
 import com.datastax.oss.driver.internal.core.metadata.MetadataManager
 import com.datastax.oss.driver.internal.core.util.Reflection
-import com.datastax.oss.driver.internal.core.util.collection.QueryPlan
+import com.datastax.oss.driver.internal.core.util.collection.SimpleQueryPlan
 import com.datastax.spark.connector.cql.LocalNodeFirstLoadBalancingPolicy.{LoadBalancingShuffleNodes, _}
 import com.datastax.spark.connector.util.DriverUtil.{toAddress, toOption}
 
@@ -119,7 +119,7 @@ class LocalNodeFirstLoadBalancingPolicy(context: DriverContext, profileName: Str
     } else {
       tokenUnawareQueryPlan(request)
     }
-    new QueryPlan(nodes: _*)
+    new SimpleQueryPlan(nodes: _*)
   }
 
   override def onAdd(node: Node) {

project/Versions.scala

@@ -5,7 +5,7 @@ object Versions {
   val CommonsLang3    = "3.5"
   val Paranamer       = "2.8"
 
-  val DataStaxJavaDriver = "4.9.0"
+  val DataStaxJavaDriver = "4.10.0"
 
   val ScalaCheck      = "1.14.0"
   val ScalaTest       = "3.0.8"