test: Updating Cassandra and DSE versions

Author: Michael Fero

cpp-driver/gtests/src/integration/options.cpp

@@ -23,8 +23,8 @@
 #include <algorithm>
 #include <iostream>
 
-#define DEFAULT_OPTIONS_CASSSANDRA_VERSION CCM::CassVersion("3.11.3")
-#define DEFAULT_OPTIONS_DSE_VERSION CCM::DseVersion("6.0.4")
+#define DEFAULT_OPTIONS_CASSSANDRA_VERSION CCM::CassVersion("3.11.4")
+#define DEFAULT_OPTIONS_DSE_VERSION CCM::DseVersion("6.0.8")
 
 // Initialize the defaults for all the options
 bool Options::is_initialized_ = false;

cpp-driver/test/ccm_bridge/data/config.txt

@@ -13,7 +13,7 @@
 #
 # Uncomment to specify Cassandra version
 ##
-#CASSANDRA_VERSION=3.11.3
+#CASSANDRA_VERSION=3.11.4
 ##
 # Flag to determine if Cassandra/DSE version should be obtained from ASF/GitHub
 #
@@ -68,7 +68,7 @@
 #
 # Uncomment to specify DSE version
 ##
-#DSE_VERSION=6.0.4
+#DSE_VERSION=6.0.8
 ##
 # CCM DSE Credentials Type (username_password|ini_file)
 #

cpp-driver/test/ccm_bridge/src/bridge.hpp

@@ -44,8 +44,8 @@ typedef struct _LIBSSH2_CHANNEL LIBSSH2_CHANNEL;
 #endif
 
 // Default values
-#define DEFAULT_CASSANDRA_VERSION CassVersion("3.11.3")
-#define DEFAULT_DSE_VERSION DseVersion("6.0.4")
+#define DEFAULT_CASSANDRA_VERSION CassVersion("3.11.4")
+#define DEFAULT_DSE_VERSION DseVersion("6.0.8")
 #define DEFAULT_USE_GIT false
 #define DEFAULT_USE_INSTALL_DIR false
 #define DEFAULT_USE_DSE false

cpp-driver/test/ccm_bridge/src/cass_version.hpp

@@ -472,13 +472,17 @@ class DseVersion : public CassVersion {
     } else if (*this == "5.1.11") {
       return CassVersion("3.11.2-5111");
     } else if (*this == "5.1.12") {
-      return CassVersion("3.11.2-5112");
-    } else if (*this >= "5.1.13" && *this < "6.0.0") {
-      if (*this > "5.1.13") {
+      return CassVersion("3.11.3-5112");
+    } else if (*this == "5.1.13") {
+      return CassVersion("3.11.3-5113");
+    } else if (*this == "5.1.14") {
+      return CassVersion("3.11.3-5114");
+    } else if (*this >= "5.1.15" && *this < "6.0.0") {
+      if (*this > "5.1.15") {
         std::cerr << "Cassandra Version is not Defined: "
                   << "Add Cassandra version for DSE v" << this->to_string() << std::endl;
       }
-      return CassVersion("3.11.2-5113");
+      return CassVersion("3.11.3-5115");
     } else if (*this >= "6.0.0" && *this < "6.7.0") {
       return CassVersion(
           "3.11.2-5111"); // Versions before DSE 6.7 erroneously return they support Cassandra 4.0.0