Merge pull request #14 from riptano/2.15.0-prep

mikefero · web-flow · commit 3f27f5ccd85d · 2020-01-09T10:45:07.000-05:00
2.15.0 release preparation
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-2.15.0-alpha
+2.15.0
 ===========
 
 Features
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # DataStax C/C++ Driver for Apache Cassandra and DataStax Products
 
-A modern, feature-rich] and highly tunable C/C++ client library for
+A modern, feature-rich and highly tunable C/C++ client library for
 [Apache Cassandra] 2.1+ using exclusively Cassandra's binary protocol and
 Cassandra Query Language v3. This driver can also be used with other DataStax
 products:
@@ -26,6 +26,24 @@ distribution:
 * [Ubuntu 18.04][ubuntu-18-04-dependencies]
 * [Windows][windows-dependencies]
 
+## Upgrading
+
+Starting with DataStax C/C++ driver for Apache Cassandra v2.15.0, DataStax
+Enterprise (DSE) support is now available; using the DSE driver exclusively is no
+longer required for DSE customers.
+
+### For DSE driver users
+
+Linking changes will be required when migrating to this driver. Replace `-ldse` with `-lcassandra`.
+
+### For Cassandra driver users
+
+No changes will be required when upgrading to this driver. There will be new
+driver dependencies when using any of the binary versions obtained from our
+[download server] as [Kerberos] is utilized in the [DSE features] of this
+driver. See the [installation] section for more information on obtaining the
+dependencies for a specific platform.
+
 ## Features
 
 * [Asynchronous API]
@@ -208,6 +226,7 @@ specific language governing permissions and limitations under the License.
 [ubuntu-18-04-dependencies]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies
 [windows-dependencies]: http://downloads.datastax.com/cpp-driver/windows/dependencies
 [DataStax Constellation]: https://constellation.datastax.com
+[Kerberos]: https://web.mit.edu/kerberos
 
 [Asynchronous API]: http://datastax.github.io/cpp-driver/topics/#futures
 [Simple]: http://datastax.github.io/cpp-driver/topics/#executing-queries
@@ -238,3 +257,4 @@ specific language governing permissions and limitations under the License.
 [DSE Proxy Authentication]: http://docs.datastax.com/en/developer/cpp-driver/latest/dse_features/authentication/#proxy-authentication
 [DSE Proxy Execution]: http://docs.datastax.com/en/developer/cpp-driver/latest/dse_features/authentication/#proxy-execution
 [DSE DateRange]: https://github.com/datastax/cpp-driver/blob/master/examples/dse/date_range/date_range.c
+[DSE features]: http://docs.datastax.com/en/developer/cpp-driver/latest/dse_features
diff --git a/appveyor.yml b/appveyor.yml
@@ -37,9 +37,9 @@ environment:
   APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true
   DRIVER_TYPE: CASS
   LIBSSH2_VERSION: 1.9.0
-  LIBUV_VERSION: 1.33.0
-  OPENSSL_1_0_VERSION: 1.0.2s
-  OPENSSL_1_1_VERSION: 1.1.1c
+  LIBUV_VERSION: 1.34.0
+  OPENSSL_1_0_VERSION: 1.0.2u
+  OPENSSL_1_1_VERSION: 1.1.1d
   ZLIB_VERSION: 1.2.11
   matrix:
     - CMAKE_GENERATOR: Visual Studio 10 2010
diff --git a/build.yaml b/build.yaml
@@ -35,7 +35,7 @@ os:
   - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.33.0
+  LIBUV_VERSION: 1.34.0
 build:
   - script: |
       . .build.sh
diff --git a/docs.yaml b/docs.yaml
@@ -69,7 +69,7 @@ versions:
   - name: "2.15"
     ref: 2.15.0
   - name: "2.14"
-    ref: 2.14.0
+    ref: 2.14.1
   - name: "2.13"
     ref: 2.13.0
   - name: "2.12"
diff --git a/include/cassandra.h b/include/cassandra.h
@@ -54,7 +54,7 @@
 #define CASS_VERSION_MAJOR 2
 #define CASS_VERSION_MINOR 15
 #define CASS_VERSION_PATCH 0
-#define CASS_VERSION_SUFFIX "alpha"
+#define CASS_VERSION_SUFFIX ""
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/tests/src/integration/ccm/bridge.hpp b/tests/src/integration/ccm/bridge.hpp
@@ -773,10 +773,6 @@ class Bridge {
    * generation
    */
   std::string host_;
-  /**
-   * Flag to determine if verbose output is enabled
-   */
-  bool is_verbose_;
 #ifdef CASS_USE_LIBSSH2
   /**
    * SSH session handle for establishing connection
@@ -795,6 +791,10 @@ class Bridge {
    * Workload values to use when setting the workload via CCM
    */
   static const std::vector<std::string> dse_workloads_;
+  /**
+   * Flag to determine if verbose output is enabled
+   */
+  bool is_verbose_;
 
 #ifdef CASS_USE_LIBSSH2
   /**
diff --git a/tests/src/integration/integration.cpp b/tests/src/integration/integration.cpp
@@ -373,7 +373,8 @@ test::driver::Cluster Integration::default_cluster(bool is_with_default_contact_
   if (is_with_default_contact_points) {
     cluster.with_contact_points(contact_points_);
   }
-  if (server_version_ >= "4.0" && protocol_version_ == CASS_PROTOCOL_VERSION_V4) {
+  if (Options::is_cassandra() && server_version_ >= "4.0" &&
+      protocol_version_ == CASS_PROTOCOL_VERSION_V4) {
     cluster.with_beta_protocol(is_beta_protocol_);
   } else {
     cluster.with_protocol_version(protocol_version_);
diff --git a/topics/README.md b/topics/README.md
@@ -268,7 +268,7 @@ with other drivers. The schedule for these features can be found on [JIRA].
 [cpp-driver-dependencies-centos7]: http://downloads.datastax.com/cpp-driver/centos/7/dependencies/
 [cpp-driver-dependencies-ubuntu14-04]: http://downloads.datastax.com/cpp-driver/ubuntu/14.04/dependencies/
 [cpp-driver-dependencies-ubuntu16-04]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/dependencies/
-[cpp-driver-dependencies-ubuntu14-04]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/
+[cpp-driver-dependencies-ubuntu18-04]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/
 [cpp-driver-dependencies-windows]: http://downloads.datastax.com/cpp-driver/windows/dependencies/
 [built from source]: http://datastax.github.io/cpp-driver/topics/building/
 [prepared statements]: http://datastax.github.io/cpp-driver/topics/basics/prepared_statements/
diff --git a/topics/building/README.md b/topics/building/README.md
@@ -123,9 +123,9 @@ your system._
 
 ```bash
 pushd /tmp
-wget http://dist.libuv.org/dist/v1.33.0/libuv-v1.33.0.tar.gz
-tar xzf libuv-v1.33.0.tar.gz
-pushd libuv-v1.33.0
+wget http://dist.libuv.org/dist/v1.34.0/libuv-v1.34.0.tar.gz
+tar xzf libuv-v1.34.0.tar.gz
+pushd libuv-v1.34.0
 sh autogen.sh
 ./configure
 make install
@@ -165,9 +165,9 @@ brew link --force openssl
 
 ```bash
 pushd /tmp
-wget --no-check-certificate https://www.openssl.org/source/openssl-1.0.2s.tar.gz
-tar xzf openssl-1.0.2s.tar.gz
-pushd openssl-1.0.2s
+wget --no-check-certificate https://www.openssl.org/source/openssl-1.0.2u.tar.gz
+tar xzf openssl-1.0.2u.tar.gz
+pushd openssl-1.0.2u
 CFLAGS=-fpic ./config shared
 make install
 popd
diff --git a/topics/cloud/README.md b/topics/cloud/README.md
@@ -2,14 +2,10 @@
 
 ## Connecting to your [DataStax Apollo database on Constellation] using a secure connection bundle
 
-   **Note:** Both the C++ Driver for Apache Cassandra and the C++ Driver for DataStax
-   Enterprise (DSE) use the same code to connect and query your Cassandra database,
-   but when using the DSE driver use the header `#include <dse.h>`.
-
    Use the following code snippet to connect your database:
 
    ```c
-   #include <cassandra.h> /* Use "#include <dse.h>" when using the C++ DSE Driver */
+   #include <cassandra.h>
    #include <stdio.h>
 
    int main(int argc, char* argv[]) {
diff --git a/topics/installation/README.md b/topics/installation/README.md
@@ -196,7 +196,7 @@ Kerberos) on Windows because they can be difficult to install/build.
 
 #### To Install
 
-First, you will need to download and install [Kerberos for Windows].
+First, you will need to download and install [Kerberos] for Windows.
 
 Unzip the packages (from http://downloads.datastax.com) and add the include and
 library directories to your project's `Additional Include Directories` and
@@ -208,3 +208,5 @@ If pre-built packages are not available for your platform or architecture you
 will need to build the driver from source. Directions for building and
 installing the DataStax C/C++ Driver for Apache Cassandra and DataStax Products
 can be found [here](/topics/building/).
+
+[Kerberos]: https://web.mit.edu/kerberos

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-2.15.0-alpha`
	`1`	`+2.15.0`
`2`	`2`	`===========`
`3`	`3`
`4`	`4`	`Features`