Merge pull request #464 from datastax/2.14.1_prep

2.14.1 prep

CHANGELOG.md

@@ -1,32 +1,52 @@
-Unreleased
+2.14.1
 ===========
 
 Bug Fixes
 --------
-* Allow remote hosts to come back up even if policy ignores down hosts
+* [CPP-849] Error result doesn't allow access to keyspace, table, and function
+  data
+* [CPP-851] Disable deprecated warnings for std::ptr_fun
+* [CPP-879] Allow remote hosts to come back up even if policy ignores down hosts
+  (community PR from kw217)
+
+Other
+--------
+* [CPP-220] Remove use of external Boost from unit and integration tests. 
+  * We ported all integration tests from Boost to Google test. This includes
+    several JIRA issues included in the [CPP-220] epic.
+* [CPP-853] Correct linking libraries for unix based OS when using
+  CASS_USE_STATIC_LIBS=On 
+* [CPP-859] Remove vc_build.bat scripts and update building documentation
+* [CPP-872] Fix GCC 9.2+ build
+* [CPP-878] Correct compile flags for libraries and executable
+* [CPP-882] Correct pthread compiler flag for older CMake versions
+
+Community
+--------
+* Fix build error when compiling without an SSL implementation (kmaragon)
 
 2.14.0
 ===========
 
 Bug Fixes
 --------
-* [CPP-819] - Ensure port is updated on already assigned contact points
-* [CPP-825] - Cloud should be verifying the peer certificates CN
+* [CPP-819] Ensure port is updated on already assigned contact points
+* [CPP-825] Cloud should be verifying the peer certificates CN
 
 2.14.0-alpha2
 ===========
 
 Features
 --------
-* [CPP-812] - Enable warnings for implicit casts and fix problems
-* [CPP-813] - Detect CaaS and change consistency default
-* [CPP-817] - Provide error if mixed usage of secure connect bundle and contact points/ssl context
+* [CPP-812] Enable warnings for implicit casts and fix problems
+* [CPP-813] Detect CaaS and change consistency default
+* [CPP-817] Provide error if mixed usage of secure connect bundle and contact points/ssl context
 
 Bug Fixes
 --------
-* [CPP-802] - Handle prepared id mismatch when repreparing on the fly
-* [CPP-815] - Schema agreement fails with SNI
-* [CPP-811] - Requests won't complete if they exceed the number of streams on a connection
+* [CPP-802] Handle prepared id mismatch when repreparing on the fly
+* [CPP-815] Schema agreement fails with SNI
+* [CPP-811] Requests won't complete if they exceed the number of streams on a connection
 
 2.14.0-alpha
 ===========

CMakeLists.txt

@@ -151,12 +151,6 @@ if(CASS_BUILD_STATIC)
     set(PC_REQUIRED_LIBS "${PC_REQUIRED_LIBS} openssl")
   endif()
 
-  # Update the test flags to indicate the use of the static library
-  if(CASS_USE_STATIC_LIBS)
-    set(TEST_CXX_FLAGS "${TEST_CXX_FLAGS} -DCASS_STATIC")
-    set(CASS_TEST_CXX_FLAGS "${CASS_TEST_CXX_FLAGS} -DCASS_STATIC")
-  endif()
-
   set_property(TARGET ${PROJECT_LIB_NAME_STATIC} PROPERTY FOLDER "Driver/Cassandra")
 endif()
 

appveyor.ps1

@@ -63,7 +63,6 @@ Function Build-Configuration-Information {
   $output = @"
 Visual Studio: $($Env:CMAKE_GENERATOR.Split(" ")[-2]) [$($Env:CMAKE_GENERATOR.Split(" ")[-1])]
 Architecture:  $($Env:Platform)
-Boost:         v$($Env:BOOST_VERSION)
 libssh2:       v$($Env:LIBSSH2_VERSION)
 libuv:         v$($Env:LIBUV_VERSION)
 OpenSSL:       v$(Get-OpenSSL-Version)
@@ -112,7 +111,6 @@ Function Environment-Information {
 
 Function Initialize-Build-Environment {
   # Get the versions for the third party dependencies
-  $boost_version = $Env:BOOST_VERSION
   $libssh2_version = $Env:LIBSSH2_VERSION
   $libuv_version = $Env:LIBUV_VERSION
   $openssl_version = Get-OpenSSL-Version
@@ -179,17 +177,15 @@ Function Initialize-Build-Environment {
   }
 
   # Generate default environment variables for per commit builds
-  $boost_version_filename = "$($boost_version.Replace(".", "_"))"
+  If ($Env:APPVEYOR_BUILD_WORKER_IMAGE -Like "Visual Studio 2019") {
+    $boost_version_directory_suffix = "1_71_0"
+  } Else {
+    $boost_version_directory_suffix = "1_69_0"
+  }
   $visual_studio_version = "$($Env:VISUAL_STUDIO_INTERNAL_VERSION.Insert(2, "."))"
 
   # Generate the default Boost environment variables
-  $Env:BOOST_ROOT = "C:/Libraries/boost_$($boost_version_filename)"
-  $Env:BOOST_LIBRARYDIR = "$($Env:BOOST_ROOT)/$($lib_architecture)-msvc-$($visual_studio_version)"
-  If (-Not (Test-Path -Path "$($Env:BOOST_LIBRARYDIR)")) {
-    # Update the Boost environment variables for CMake to find installation
-    $Env:BOOST_ROOT = "$($libs_location_prefix)/boost-$($boost_version)"
-    $Env:BOOST_LIBRARYDIR = "$($Env:BOOST_ROOT)/$($lib_architecture)-msvc-$($visual_studio_version)"
-  }
+  $Env:BOOST_ROOT = "C:/Libraries/boost_$($boost_version_directory_suffix)"
   $Env:BOOST_INCLUDEDIR = "$($Env:BOOST_ROOT)/include"
 
   # Generate the default libssh2 environment variables
@@ -509,55 +505,6 @@ add_dependencies(`${PROJECT_NAME} `${ZLIB_LIBRARY_NAME})
     }
   }
 
-  # Handle installation of the per commit dependencies (e.g. Test builds)
-  # Determine if Boost should be installed (pre-installed or cached)
-  If (-Not (Test-Path -Path "$($Env:BOOST_LIBRARYDIR)")) {
-    New-Item -ItemType Directory -Force -Path "$($dependencies_build_location_prefix)/boost" | Out-Null
-    Push-Location -Path "$($dependencies_build_location_prefix)/boost"
-
-    $cmakelists_contents = @"
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
-project(Boost)
-set(PROJECT_DISPLAY_NAME "AppVeyor CI Build for Boost")
-set(PROJECT_MODULE_DIR $cmake_modules_dir)
-set(CMAKE_MODULE_PATH `${CMAKE_MODULE_PATH} `${PROJECT_MODULE_DIR})
-include(ExternalProject-boost)
-set(GENERATED_SOURCE_FILE `${CMAKE_CURRENT_BINARY_DIR}/main.cpp)
-file(REMOVE `${GENERATED_SOURCE_FILE})
-file(WRITE `${GENERATED_SOURCE_FILE} "int main () { return 0; }")
-add_executable(`${PROJECT_NAME} `${GENERATED_SOURCE_FILE})
-add_dependencies(`${PROJECT_NAME} `${BOOST_LIBRARY_NAME})
-"@
-    $cmakelists_contents | Out-File -FilePath "CMakeLists.txt" -Encoding Utf8 -Force
-
-    Write-Host "Configuring Boost"
-    cmake -G "$($Env:CMAKE_GENERATOR)" -A $Env:CMAKE_PLATFORM "-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"
-      }
-      If (Test-Path -Path "build/CMakeFiles/CMakeError.log") {
-        Push-AppveyorArtifact "build/CMakeFiles/CMakeError.log" -DeploymentName "Boost Error Log"
-      }
-      Pop-Location
-      Throw "Failed to configure Boost for MSVC $($Env:VISUAL_STUDIO_INTERNAL_VERSION)-$($Env:Platform)"
-    }
-    Write-Host "Building and Installing Boost"
-    cmake --build . --config RelWithDebInfo
-    If ($LastExitCode -ne 0) {
-      If (Test-Path -Path "build/CMakeFiles/CMakeOutput.log") {
-        Push-AppveyorArtifact "build/CMakeFiles/CMakeOutput.log" -DeploymentName "Boost Output Log"
-      }
-      If (Test-Path -Path "build/CMakeFiles/CMakeError.log") {
-        Push-AppveyorArtifact "build/CMakeFiles/CMakeError.log" -DeploymentName "Boost Error Log"
-      }
-      Pop-Location
-      Throw "Failed to build Boost for MSVC $($Env:VISUAL_STUDIO_INTERNAL_VERSION)-$($Env:Platform)"
-    }
-
-    Pop-Location
-  }
-
   # Determine if libssh2 should be installed (cached)
   If (-Not (Test-Path -Path "$($Env:LIBSSH2_ROOT_DIR)/lib")) { # lib directory checked due to external project being CMake (automatically creates root directory)
     New-Item -ItemType Directory -Force -Path "$($dependencies_build_location_prefix)/libssh2" | Out-Null

appveyor.yml

@@ -37,7 +37,6 @@ environment:
     secure: h28bN22Py3CZPqrWoZWEjIFnpes+kslusCKP1mRYdUqBEf+OO1kFEQTZ9DGD7tuCSIIRDI3Mf9LX8zgUdmdlZA==
   APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true
   DRIVER_TYPE: CASS
-  BOOST_VERSION: 1.69.0
   LIBSSH2_VERSION: 1.9.0
   LIBUV_VERSION: 1.33.0
   OPENSSL_1_0_VERSION: 1.0.2s
@@ -88,12 +87,10 @@ environment:
       OPENSSL_MAJOR_MINOR: 1.0
       VISUAL_STUDIO_INTERNAL_VERSION: 142
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      BOOST_VERSION: 1.70.0
 #    - CMAKE_GENERATOR: Visual Studio 16 2019
 #      OPENSSL_MAJOR_MINOR: 1.1
 #      VISUAL_STUDIO_INTERNAL_VERSION: 142
 #      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-#      BOOST_VERSION: 1.70.0
 #init:
 #  - ps: iex ((New-Object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 install: