apache · mikefero · Jul 1, 2019 · Apr 19, 2019 · Apr 19, 2019 · Apr 25, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,23 +1,40 @@
+1.9.0
+===========
+
+Features
+--------
+* [CPP-745] Exponential reconnection policy with jitter
+* [CPP-769] Use `clang-format` to fix up formatting
+* [CPP-775] Add `clang-format` to Windows
+
+Other
+--------
+* [CPP-743] Move internal components from `namespace cass` to `namespace datastax::internal`
+* [CPP-764] Rename namespace from `cass` to `datastax`
+* [CPP-766] Allow RPM packaging script to build RPM packages for Amazon Linux
+* [CPP-770] Fix header files include guard (\_\_CASS_XXX to DATASTAX_XXX)
+* [CPP-772] Remove per cpp file LOG_FILE attribute to speed up Windows builds
+
 1.8.0
 ===========
 
 Features
 --------
-[CPP-722] Insightful monitoring (Insights) startup message
-[CPP-723] Insightful monitoring (Insights) status event message
-[CPP-741] Allow user to configure client ID
-[CPP-751] Call host listener callback for the initial set of hosts
+* [CPP-722] Insightful monitoring (Insights) startup message
+* [CPP-723] Insightful monitoring (Insights) status event message
+* [CPP-741] Allow user to configure client ID
+* [CPP-751] Call host listener callback for the initial set of hosts
 
 Bug Fixes
 --------
-[CPP-755] UDT metadata not being properly populated/updated
+* [CPP-755] UDT metadata not being properly populated/updated
 
 Other
 --------
-[CPP-705] Deprecate DC-aware multi-DC settings (`used_hosts_per_remote_dc`
-          and `allowRemoteDCsForLocalConsistencyLevel `)
-[CPP-720] Streamline custom allocator
-[CPP-752] Add connection count to Host
+* [CPP-705] Deprecate DC-aware multi-DC settings (`used_hosts_per_remote_dc`
+            and `allowRemoteDCsForLocalConsistencyLevel `)
+* [CPP-720] Streamline custom allocator
+* [CPP-752] Add connection count to Host
 
 1.7.0
 ===========

diff --git a/appveyor.yml b/appveyor.yml
@@ -41,10 +41,10 @@ environment:
   APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true
   DRIVER_TYPE: DSE
   BOOST_VERSION: 1.69.0
-  LIBSSH2_VERSION: 1.8.2
-  LIBUV_VERSION: 1.28.0
-  OPENSSL_1_0_VERSION: 1.0.2r
-  OPENSSL_1_1_VERSION: 1.1.1b
+  LIBSSH2_VERSION: 1.9.0
+  LIBUV_VERSION: 1.29.1
+  OPENSSL_1_0_VERSION: 1.0.2s
+  OPENSSL_1_1_VERSION: 1.1.1c
   matrix:
     - CMAKE_GENERATOR: Visual Studio 10 2010
       OPENSSL_MAJOR_MINOR: 1.0

diff --git a/build.yaml b/build.yaml
@@ -19,7 +19,7 @@ os:
   - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.28.0
+  LIBUV_VERSION: 1.29.1
 build:
   - script: |
       . ./cpp-driver/.build.sh

diff --git a/cpp-driver/CHANGELOG.md b/cpp-driver/CHANGELOG.md
@@ -1,19 +1,43 @@
+2.13.0
+===========
+
+Features
+--------
+* [CPP-745] Exponential reconnection policy with jitter
+* [CPP-769] Use `clang-format` to fix up formatting
+* [CPP-775] Add `clang-format` to Windows
+
+Other
+--------
+* [CPP-743] Move internal components from `namespace cass` to `namespace datastax::internal`
+* [CPP-764] Rename namespace from `cass` to `datastax`
+* [CPP-766] Allow RPM packaging script to build RPM packages for Amazon Linux
+* [CPP-770] Fix header files include guard (\_\_CASS_XXX to DATASTAX_XXX)
+* [CPP-772] Remove per cpp file LOG_FILE attribute to speed up Windows builds
+
+Community
+--------
+* Fixed the location of the '[in]' information for Doxygen. (AlexisWilke)
+* Added header subdirectory installation capability. (accelerated)
+* Changed pkg_config templates to use the library variable name. (accelerated)
+* Fix generation of shlib deps file for debian packages. (jirkasilhan)
+
 2.12.0
 ===========
 
 Features
 --------
-[CPP-751] Call host listener callback for the initial set of hosts
+* [CPP-751] Call host listener callback for the initial set of hosts
 
 Bug Fixes
 --------
-[CPP-755] UDT metadata not being properly populated/updated
+* [CPP-755] UDT metadata not being properly populated/updated
 
 Other
 --------
-[CPP-705] Deprecate DC-aware multi-DC settings (`used_hosts_per_remote_dc`
-          and `allowRemoteDCsForLocalConsistencyLevel `)
-[CPP-720] Streamline custom allocator
+* [CPP-705] Deprecate DC-aware multi-DC settings (`used_hosts_per_remote_dc`
+            and `allowRemoteDCsForLocalConsistencyLevel `)
+* [CPP-720] Streamline custom allocator
 
 2.11.0
 ===========

diff --git a/cpp-driver/appveyor.yml b/cpp-driver/appveyor.yml
@@ -40,10 +40,10 @@ environment:
   APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true
   DRIVER_TYPE: CASS
   BOOST_VERSION: 1.69.0
-  LIBSSH2_VERSION: 1.8.2
-  LIBUV_VERSION: 1.28.0
-  OPENSSL_1_0_VERSION: 1.0.2r
-  OPENSSL_1_1_VERSION: 1.1.1b
+  LIBSSH2_VERSION: 1.9.0
+  LIBUV_VERSION: 1.29.1
+  OPENSSL_1_0_VERSION: 1.0.2s
+  OPENSSL_1_1_VERSION: 1.1.1c
   matrix:
     - CMAKE_GENERATOR: Visual Studio 10 2010
       OPENSSL_MAJOR_MINOR: 1.0

diff --git a/cpp-driver/build.yaml b/cpp-driver/build.yaml
@@ -19,7 +19,7 @@ os:
   - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.28.0
+  LIBUV_VERSION: 1.29.1
 build:
   - script: |
       . .build.sh

diff --git a/cpp-driver/cmake/modules/ExternalProject-OpenSSL.cmake b/cpp-driver/cmake/modules/ExternalProject-OpenSSL.cmake
@@ -21,8 +21,8 @@ endif()
 # OpenSSL related CMake options
 option(OPENSSL_VERSION "OpenSSL version to build and install")
 if(NOT OPENSSL_VERSION)
-  # TODO: Should we default to OpenSSL 1.1 (e.g. 1.1.1b)?
-  set(OPENSSL_VERSION "1.0.2r")
+  # TODO: Should we default to OpenSSL 1.1 (e.g. 1.1.1c)?
+  set(OPENSSL_VERSION "1.0.2s")
 endif()
 option(OPENSSL_INSTALL_PREFIX "OpenSSL installation prefix location")
 if(CASS_USE_ZLIB)

diff --git a/cpp-driver/cmake/modules/ExternalProject-libssh2.cmake b/cpp-driver/cmake/modules/ExternalProject-libssh2.cmake
@@ -22,7 +22,7 @@ if(NOT LIBSSH2_INSTALL_PREFIX)
 endif()
 option(LIBSSH2_VERSION "libssh2 version to build and install")
 if(NOT LIBSSH2_VERSION)
-  set(LIBSSH2_VERSION "1.8.2")
+  set(LIBSSH2_VERSION "1.9.0")
 endif()
 set(LIBSSH2_VERSION ${LIBSSH2_VERSION} CACHE STRING "libssh2 version to build and install" FORCE)
 

diff --git a/cpp-driver/cmake/modules/ExternalProject-libuv.cmake b/cpp-driver/cmake/modules/ExternalProject-libuv.cmake
@@ -22,7 +22,7 @@ if(NOT LIBUV_INSTALL_PREFIX)
 endif()
 option(LIBUV_VERSION "libuv version to build and install")
 if(NOT LIBUV_VERSION)
-  set(LIBUV_VERSION "1.28.0")
+  set(LIBUV_VERSION "1.29.1")
 endif()
 set(LIBUV_VERSION ${LIBUV_VERSION} CACHE STRING "libuv version to build and install" FORCE)
 

diff --git a/cpp-driver/docs.yaml b/cpp-driver/docs.yaml
@@ -57,6 +57,8 @@ rules:
   use_path_nav_files_only: true
 
 versions:
+  - name: "2.13"
+    ref: 2.13.0
   - name: "2.12"
     ref: 2.12.0
   - name: "2.11"

diff --git a/cpp-driver/gtests/src/integration/options.cpp b/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;

diff --git a/cpp-driver/gtests/src/integration/tests/test_cluster.cpp b/cpp-driver/gtests/src/integration/tests/test_cluster.cpp
@@ -39,10 +39,10 @@ TEST(ClusterTest, SetLoadBalanceDcAwareNullLocalDc) {
 TEST(ClusterTest, ExponentialReconnectionPolicyBadParameters) {
   test::driver::Cluster cluster;
 
-  // Base delay cannot be zero
+  // Base delay must be greater than 1
   EXPECT_EQ(CASS_ERROR_LIB_BAD_PARAMS, cass_cluster_set_exponential_reconnect(cluster.get(), 0, 1));
-  // Max delay cannot be zero
+  // Max delay must be greater than 1
   EXPECT_EQ(CASS_ERROR_LIB_BAD_PARAMS, cass_cluster_set_exponential_reconnect(cluster.get(), 1, 0));
   // Base delay cannot be greater than max delay
-  EXPECT_EQ(CASS_ERROR_LIB_BAD_PARAMS, cass_cluster_set_exponential_reconnect(cluster.get(), 2, 1));
+  EXPECT_EQ(CASS_ERROR_LIB_BAD_PARAMS, cass_cluster_set_exponential_reconnect(cluster.get(), 3, 2));
 }
diff --git a/cpp-driver/gtests/src/unit/tests/test_cluster.cpp b/cpp-driver/gtests/src/unit/tests/test_cluster.cpp
@@ -952,8 +952,8 @@ TEST_F(ClusterUnitTest, ReconnectionPolicy) {
 
   ClusterUnitTestReconnectionPolicy::Ptr policy(
       static_cast<ClusterUnitTestReconnectionPolicy::Ptr>(settings.reconnection_policy));
-  EXPECT_EQ(2, policy->reconnection_schedule_count());
-  EXPECT_EQ(2, policy->destroyed_reconnection_schedule_count());
+  EXPECT_EQ(2u, policy->reconnection_schedule_count());
+  EXPECT_EQ(2u, policy->destroyed_reconnection_schedule_count());
   EXPECT_GE(policy->scheduled_delay_count(), 2u);
-  EXPECT_EQ(3, mock_cluster.connection_attempts(1)); // Includes initial connection attempt
+  EXPECT_EQ(3u, mock_cluster.connection_attempts(1)); // Includes initial connection attempt
 }
diff --git a/cpp-driver/gtests/src/unit/tests/test_pool.cpp b/cpp-driver/gtests/src/unit/tests/test_pool.cpp
@@ -772,7 +772,7 @@ TEST_F(PoolUnitTest, ReconnectionPolicy) {
   settings.reconnection_policy.reset(new PoolUnitTestReconnectionPolicy());
   initializer->with_settings(settings)->with_listener(listener.get())->initialize(loop(), hosts);
   uv_run(loop(), UV_RUN_DEFAULT);
-  EXPECT_EQ(listener_status.count(ListenerStatus::UP), 2) << listener_status.results();
+  EXPECT_EQ(listener_status.count(ListenerStatus::UP), 2u) << listener_status.results();
 
   // Stop and start node 1 twice engaging the reconnection policy
   listener->reset(&reconnect_listener_status);
@@ -787,11 +787,11 @@ TEST_F(PoolUnitTest, ReconnectionPolicy) {
 
   PoolUnitTestReconnectionPolicy::Ptr policy(
       static_cast<PoolUnitTestReconnectionPolicy::Ptr>(settings.reconnection_policy));
-  EXPECT_EQ(2, policy->reconnection_schedule_count());
-  EXPECT_EQ(2, policy->destroyed_reconnection_schedule_count());
-  EXPECT_EQ(2, policy->scheduled_delay_count());
-  EXPECT_EQ(3, cluster.connection_attempts(1)); // Includes initial connection attempt
-  EXPECT_EQ(1, cluster.connection_attempts(2));
+  EXPECT_EQ(2u, policy->reconnection_schedule_count());
+  EXPECT_EQ(2u, policy->destroyed_reconnection_schedule_count());
+  EXPECT_EQ(2u, policy->scheduled_delay_count());
+  EXPECT_EQ(3u, cluster.connection_attempts(1)); // Includes initial connection attempt
+  EXPECT_EQ(1u, cluster.connection_attempts(2));
 }
 
 TEST_F(PoolUnitTest, PartialReconnect) {

diff --git a/cpp-driver/gtests/src/unit/tests/test_protocol_version.cpp b/cpp-driver/gtests/src/unit/tests/test_protocol_version.cpp
@@ -21,7 +21,7 @@
 #include "cassandra.h"
 #include "protocol.hpp"
 
-using cass::ProtocolVersion;
+using datastax::internal::core::ProtocolVersion;
 
 class ProtocolVersionUnitTest : public Unit {};
 

diff --git a/cpp-driver/include/cassandra.h b/cpp-driver/include/cassandra.h
@@ -52,7 +52,7 @@
  */
 
 #define CASS_VERSION_MAJOR 2
-#define CASS_VERSION_MINOR 12
+#define CASS_VERSION_MINOR 13
 #define CASS_VERSION_PATCH 0
 #define CASS_VERSION_SUFFIX ""
 

diff --git a/cpp-driver/src/monitor_reporting.cpp b/cpp-driver/src/monitor_reporting.cpp
@@ -16,9 +16,14 @@
 
 #include "monitor_reporting.hpp"
 
+using namespace datastax;
 using namespace datastax::internal::core;
 
+namespace datastax { namespace internal { namespace core {
+
 MonitorReporting* create_monitor_reporting(const String& client_id, const String& session_id,
                                            const Config& config) {
   return new NopMonitorReporting();
 }
+
+}}} // namespace datastax::internal::core
diff --git a/cpp-driver/src/protocol.cpp b/cpp-driver/src/protocol.cpp
@@ -21,6 +21,7 @@
 #define DSE_PROTOCOL_VERSION_BIT 0x40
 #define DSE_PROTOCOL_VERSION_MASK 0x3F
 
+using namespace datastax;
 using namespace datastax::internal::core;
 
 ProtocolVersion::ProtocolVersion()

diff --git a/cpp-driver/test/ccm_bridge/data/config.txt b/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)
 #

diff --git a/cpp-driver/test/ccm_bridge/src/bridge.hpp b/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

diff --git a/cpp-driver/test/ccm_bridge/src/cass_version.hpp b/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

diff --git a/docs.yaml b/docs.yaml
@@ -88,6 +88,8 @@ rules:
   use_path_nav_files_only: true
 
 versions:
+  - name: 1.9
+    ref: 1.9.0
   - name: 1.8
     ref: 1.8.0
   - name: 1.7

diff --git a/include/dse.h b/include/dse.h
@@ -49,7 +49,7 @@
  */
 
 #define DSE_VERSION_MAJOR 1
-#define DSE_VERSION_MINOR 8
+#define DSE_VERSION_MINOR 9
 #define DSE_VERSION_PATCH 0
 #define DSE_VERSION_SUFFIX ""