Merge pull request #441 from datastax/2.12.0_prep

OSS 2.12.0 preparation

Author: mikefero

.build.osx.sh

@@ -22,7 +22,7 @@ configure_environment() {
 install_libuv() {
   if brew ls --versions libuv > /dev/null; then
     if ! brew outdated libuv; then
-      brew upgrade --cleanup libuv
+      brew upgrade libuv
     fi
   else
     brew install libuv
@@ -32,7 +32,7 @@ install_libuv() {
 install_openssl() {
   if brew ls --versions openssl > /dev/null; then
     if ! brew outdated openssl; then
-      brew upgrade --cleanup openssl
+      brew upgrade openssl
     fi
   else
     brew install openssl

CHANGELOG.md

@@ -1,3 +1,20 @@
+2.12.0
+===========
+
+Features
+--------
+[CPP-751] Call host listener callback for the initial set of hosts
+
+Bug Fixes
+--------
+[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
+
 2.11.0
 ===========
 

appveyor.ps1

@@ -342,7 +342,7 @@ add_dependencies(`${PROJECT_NAME} `${LIBUV_LIBRARY_NAME})
     $cmakelists_contents | Out-File -FilePath "CMakeLists.txt" -Encoding Utf8 -Force
 
     Write-Host "Configuring libuv"
-    cmake -G "$($cmake_generator)" -DBUILD_SHARED_LIBS=On "-DLIBUV_VERSION=$($Env:LIBUV_VERSION)" "-DLIBUV_INSTALL_PREFIX=$($Env:LIBUV_ROOT_DIR)"
+    cmake -G "$($cmake_generator)" -DBUILD_SHARED_LIBS=On "-DLIBUV_VERSION=$($Env:LIBUV_VERSION)" "-DLIBUV_INSTALL_PREFIX=$($Env:LIBUV_ROOT_DIR)" .
     If ($LastExitCode -ne 0) {
       If (Test-Path -Path "build/CMakeFiles/CMakeOutput.log") {
         Push-AppveyorArtifact "build/CMakeFiles/CMakeOutput.log" -DeploymentName "libuv Output Log"
@@ -395,7 +395,7 @@ add_dependencies(`${PROJECT_NAME} `${OPENSSL_LIBRARY_NAME})
       if ("$_" -Like "shared") {
         $shared_libs = "On"
       }
-      cmake -G "$($cmake_generator)" "-DBUILD_SHARED_LIBS=$($shared_libs)" "-DOPENSSL_VERSION=$($Env:OPENSSL_VERSION)" "-DOPENSSL_INSTALL_PREFIX=$($Env:OPENSSL_BASE_DIR)/$_"
+      cmake -G "$($cmake_generator)" "-DBUILD_SHARED_LIBS=$($shared_libs)" "-DOPENSSL_VERSION=$($Env:OPENSSL_VERSION)" "-DOPENSSL_INSTALL_PREFIX=$($Env:OPENSSL_BASE_DIR)/$_" .
       If ($LastExitCode -ne 0) {
         If (Test-Path -Path "build/CMakeFiles/CMakeOutput.log") {
           Push-AppveyorArtifact "build/CMakeFiles/CMakeOutput.log" -DeploymentName "OpenSSL Output Log"
@@ -476,7 +476,7 @@ add_dependencies(`${PROJECT_NAME} `${BOOST_LIBRARY_NAME})
     $cmakelists_contents | Out-File -FilePath "CMakeLists.txt" -Encoding Utf8 -Force
 
     Write-Host "Configuring Boost"
-    cmake -G "$($cmake_generator)" "-DBOOST_VERSION=$($Env:BOOST_VERSION)" "-DBOOST_INSTALL_PREFIX=$($Env:BOOST_ROOT)"
+    cmake -G "$($cmake_generator)" "-DBOOST_VERSION=$($Env:BOOST_VERSION)" "-DBOOST_INSTALL_PREFIX=$($Env:BOOST_ROOT)" .
     If ($LastExitCode -ne 0) {
       If (Test-Path -Path "build/CMakeFiles/CMakeOutput.log") {
         Push-AppveyorArtifact "build/CMakeFiles/CMakeOutput.log" -DeploymentName "Boost Output Log"
@@ -524,7 +524,7 @@ add_dependencies(`${PROJECT_NAME} `${LIBSSH2_LIBRARY_NAME})
     $cmakelists_contents | Out-File -FilePath "CMakeLists.txt" -Encoding Utf8 -Force
 
     Write-Host "Configuring libssh2"
-    cmake -G "$($cmake_generator)" "-DLIBSSH2_VERSION=$($Env:LIBSSH2_VERSION)" "-DLIBSSH2_INSTALL_PREFIX=$($Env:LIBSSH2_ROOT_DIR)"
+    cmake -G "$($cmake_generator)" "-DLIBSSH2_VERSION=$($Env:LIBSSH2_VERSION)" "-DLIBSSH2_INSTALL_PREFIX=$($Env:LIBSSH2_ROOT_DIR)" .
     If ($LastExitCode -ne 0) {
       If (Test-Path -Path "build/CMakeFiles/CMakeOutput.log") {
         Push-AppveyorArtifact "build/CMakeFiles/CMakeOutput.log" -DeploymentName "libssh2 Output Log"

appveyor.yml

@@ -39,11 +39,11 @@ environment:
   APPVEYOR_BUILD_WORKER_CLOUD: gce
   APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true
   DRIVER_TYPE: CASS
-  BOOST_VERSION: 1.68.0
-  LIBSSH2_VERSION: 1.8.0
-  LIBUV_VERSION: 1.24.0
-  OPENSSL_1_0_VERSION: 1.0.2q
-  OPENSSL_1_1_VERSION: 1.1.1a
+  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
   matrix:
     - CMAKE_GENERATOR: Visual Studio 10 2010
       OPENSSL_MAJOR_MINOR: 1.0

build.yaml

@@ -14,12 +14,12 @@ architecture:
 os:
   - ubuntu/bionic64/cpp
   - ubuntu/trusty64/cpp
-  - ubuntu/xenial64
-  - centos/6-64
-  - centos/7-64
+  - ubuntu/xenial64/cpp
+  - centos/6-64/cpp
+  - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.24.0
+  LIBUV_VERSION: 1.28.0
 build:
   - script: |
       . .build.sh

cmake/modules/ExternalProject-Boost.cmake

@@ -23,7 +23,7 @@ if(NOT BOOST_INSTALL_PREFIX)
 endif()
 option(BOOST_VERSION "Boost version to build and install")
 if(NOT BOOST_VERSION)
-  set(BOOST_VERSION "1.68.0")
+  set(BOOST_VERSION "1.69.0")
 endif()
 set(BOOST_VERSION ${BOOST_VERSION} CACHE STRING "Boost version to build and install" FORCE)
 

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.1a)?
-  set(OPENSSL_VERSION "1.0.2q")
+  # TODO: Should we default to OpenSSL 1.1 (e.g. 1.1.1b)?
+  set(OPENSSL_VERSION "1.0.2r")
 endif()
 option(OPENSSL_INSTALL_PREFIX "OpenSSL installation prefix location")
 if(CASS_USE_ZLIB)

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.0")
+  set(LIBSSH2_VERSION "1.8.2")
 endif()
 set(LIBSSH2_VERSION ${LIBSSH2_VERSION} CACHE STRING "libssh2 version to build and install" FORCE)
 

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.24.0")
+  set(LIBUV_VERSION "1.28.0")
 endif()
 set(LIBUV_VERSION ${LIBUV_VERSION} CACHE STRING "libuv version to build and install" FORCE)
 

docs.yaml

@@ -56,6 +56,8 @@ rules:
   use_path_nav_files_only: true
 
 versions:
+  - name: "2.12"
+    ref: 2.12.0
   - name: "2.11"
     ref: 2.11.0
   - name: "2.10"