[YCQL] #3897 Upgrade Cassandra Java driver to 3.8.x

Summary: Upgrading the Java tests to use the latest Cassandra Java Driver to 3.8.0-yb-4 which is forked from latest support branch of upstream Datastax Cassandra driver 3.8.x Test Plan: jenkins, Executed java test cases, mvn test -Dtest=com.yugabyte.driver.core.** Reviewers: neha, mihnea Reviewed By: mihnea Subscribers: nikhil Differential Revision: https://phabricator.dev.yugabyte.com/D8302
yugabyte · May 8, 2020 · 19137cd · 19137cd
1 parent 7eab087
commit 19137cd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -84,7 +84,7 @@
 
     <!-- Library dependencies -->
     <async.version>1.4.1</async.version>
-    <cassandra-driver-core.version>3.2.0-yb-19</cassandra-driver-core.version>
+    <cassandra-driver-core.version>3.8.0-yb-4</cassandra-driver-core.version>
     <spark-cassandra-connector.version>2.4-yb-2</spark-cassandra-connector.version>
     <lz4.version>1.3.0</lz4.version>
     <snappy.version>1.1.4</snappy.version>
@@ -222,6 +222,25 @@
           <artifactId>protobuf-maven-plugin</artifactId>
           <version>${protobuf-maven-plugin.version}</version>
         </plugin>
+        <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>${maven-antrun-plugin.version}</version>
+        <executions>
+          <execution>
+            <phase>test-compile</phase>
+            <configuration>
+              <target>
+                <delete dir="${testdata.dir}"/>
+                <mkdir dir="${testdata.dir}"/>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       </plugins>
     </pluginManagement>
 
@@ -276,25 +295,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>${maven-antrun-plugin.version}</version>
-        <executions>
-          <execution>
-            <phase>test-compile</phase>
-            <configuration>
-              <target>
-                <delete dir="${testdata.dir}"/>
-                <mkdir dir="${testdata.dir}"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>

diff --git a/java/yb-cql/src/test/java/com/datastax/driver/core/TestSystemTables.java b/java/yb-cql/src/test/java/com/datastax/driver/core/TestSystemTables.java
@@ -42,12 +42,14 @@ public void testSystemTables() throws Exception {
     List<InetSocketAddress> contactPoints = miniCluster.getCQLContactPoints();
     assertEquals(NUM_TABLET_SERVERS, contactPoints.size());
 
+    TranslatedAddressEndPoint translatedContactPointToConnect;
     // Chose one contact point to connect.
     for (InetSocketAddress contactPointToConnect : contactPoints) {
 
       // Initialize connection.
-      Host host = new Host(contactPointToConnect, cluster.manager.convictionPolicyFactory,
-        cluster.manager);
+      translatedContactPointToConnect = new TranslatedAddressEndPoint(contactPointToConnect);
+      Host host = new Host(translatedContactPointToConnect, cluster.manager.convictionPolicyFactory,
+            cluster.manager);
       Connection connection = cluster.manager.connectionFactory.open(host);
 
       // Run query and verify.