Skip to content

Commit f49a413

Browse files
authored
cassandra.h, changelog and documentation updates for 2.17.0 (#552)
1 parent a865ff7 commit f49a413

File tree

7 files changed

+118
-249
lines changed

7 files changed

+118
-249
lines changed

CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
1+
2.17.0
2+
===========
3+
* [CPP-942] Add docs on possibility of MITM attacks with cass_cluster_set_use_hostname_resolution()
4+
* [CPP-955] Unable to use different memory allocators and profilers when using the cassandra driver
5+
* [CPP-957] Update build/test platforms
6+
* [CPP-919] CMake 3.16 deprecation warnings
7+
8+
Community
9+
--------
10+
* [PR #522] Iterate over all certificates in a trusted cert BIO, not just the first (kw217)
11+
* [PR #528] Add support for newer versions of LibreSSL (gahr)
12+
* [PR #525] Allow users to request TLS client-side enforcement (FalacerSelene)
13+
114
2.16.2
215
===========
316

417
Bug Fixes
518
--------
619
* [CPP-946] Core dump on unclean event loop shutdown
720
* [PR #513] Fix SNI events
8-
* [PR #518] Replace deprecated function for OpenSSL >= 3.0
21+
22+
Community
23+
--------
24+
* [PR #518] Replace deprecated function for OpenSSL >= 3.0 (pjgeorg)
925

1026
2.16.1
1127
===========

Jenkinsfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ def testDriverInstallation() {
263263
}
264264

265265
def deployDriver() {
266-
withCredentials([usernameColonPassword(credentialsId: 'drivers-artifactory-upload-username-encrypted-password', variable: 'ARTIFACTORY_CREDENTIALS'),
266+
withCredentials([usernameColonPassword(credentialsId: 'cpp-drivers-artifactory-upload-username-encrypted-password', variable: 'ARTIFACTORY_CREDENTIALS'),
267267
string(credentialsId: 'artifactory-base-url', variable: 'ARTIFACTORY_BASE_URL')]) {
268268
sh label: 'Deploy driver to Artifactory', script: '''#!/bin/bash -le
269269
. ${DRIVER_BUILD_SCRIPT}
@@ -406,9 +406,9 @@ pipeline {
406406
choice(
407407
name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_SERVER_VERSION',
408408
choices: [
409-
'3.0', // Previous Apache Cassandra®
410-
'3.11', // Current Apache Cassandra®
411-
'4.0', // Development Apache Cassandra®
409+
'3.0', // Previous Apache Cassandra
410+
'3.11', // Current Apache Cassandra
411+
'4.0', // Development Apache Cassandra
412412
'dse-5.1.35', // Legacy DataStax Enterprise
413413
'dse-6.8.30', // Development DataStax Enterprise
414414
'ALL'],
@@ -728,9 +728,9 @@ pipeline {
728728
axes {
729729
axis {
730730
name 'SERVER_VERSION'
731-
values '3.0', // Previous Apache Cassandra®
732-
'3.11', // Current Apache Cassandra®
733-
'4.0', // Development Apache Cassandra®
731+
values '3.0', // Previous Apache Cassandra
732+
'3.11', // Current Apache Cassandra
733+
'4.0', // Development Apache Cassandra
734734
'dse-5.1.35', // Legacy DataStax Enterprise
735735
'dse-6.8.30' // Development DataStax Enterprise
736736
}

README.md

Lines changed: 44 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,28 @@ products:
1010

1111
## Getting the Driver
1212

13-
Binary versions of the driver, available for multiple operating systems and
14-
multiple architectures, can be obtained from our [download server]. The
15-
source code is made available via [GitHub].
16-
17-
Packages for the driver's dependencies, libuv (1.x), OpenSSL, and zlib are also
18-
provided under the `dependencies` directory for each platform (if applicable).
19-
__Note__: CentOS and Ubuntu use the version of OpenSSL and zlib provided with the
20-
distribution:
21-
22-
* [CentOS 6][centos-6-dependencies]
23-
* [CentOS 7][centos-7-dependencies]
24-
* [CentOS 8][centos-8-dependencies]
25-
* [Ubuntu 14.04][ubuntu-14-04-dependencies]
26-
* [Ubuntu 16.04][ubuntu-16-04-dependencies]
27-
* [Ubuntu 18.04][ubuntu-18-04-dependencies]
28-
* [Windows][windows-dependencies]
13+
The source code is made available via [GitHub]. Additionally binary versions of
14+
the driver (for multiple operating systems and multiple architectures) can be
15+
obtained from our [Artifactory server]. Binaries are available for the following
16+
operating systems:
17+
18+
* CentOS 7
19+
* Rocky Linux 8.8
20+
* Rocky Linux 9.2
21+
* Ubuntu 20.04
22+
* Ubuntu 22.04
23+
* Windows
24+
25+
The driver depends on the following libraries:
26+
27+
* libuv (1.x)
28+
* OpenSSL
29+
* zlib
30+
31+
The version of OpenSSL and zlib provided with each Linux distribution above can be used
32+
to build the driver. A version of libuv > 1.x is provided for CentOS 7 and Rocky
33+
Linux; this can be found under the `dependencies` directory for each platform.
34+
Packages for all three dependencies are provided for Windows distributions.
2935

3036
## Upgrading
3137

@@ -41,7 +47,7 @@ Linking changes will be required when migrating to this driver. Replace `-ldse`
4147

4248
No changes will be required when upgrading to this driver. There will be new
4349
driver dependencies when using any of the binary versions obtained from our
44-
[download server] as [Kerberos] is utilized in the [DSE features] of this
50+
[Artifactory server] as [Kerberos] is utilized in the [DSE features] of this
4551
driver. See the [installation] section for more information on obtaining the
4652
dependencies for a specific platform.
4753

@@ -85,11 +91,22 @@ dependencies for a specific platform.
8591
## Compatibility
8692

8793
This driver works exclusively with the Cassandra Query Language v3 (CQL3) and
88-
Cassandra's native protocol. The current version works with:
94+
Cassandra's native protocol. The current version works with the following
95+
server versions:
96+
97+
* Apache Cassandra® versions 3.0.x, 3.11.x and 4.0.x
98+
* DSE versions 6.8.x and 5.1.x
99+
100+
Both 32-bit (x86) and 64-bit (x64) architectures are supported
101+
102+
We build and test the driver on the following platforms:
89103

90-
* Apache Cassandra® versions 2.1, 2.2 and 3.0+
91-
* Architectures: 32-bit (x86) and 64-bit (x64)
92-
* Compilers: GCC 4.1.2+, Clang 3.4+, and MSVC 2010/2012/2013/2015/2017/2019
104+
* CentOS 7 w/ gcc 4.8.5
105+
* Rocky Linux 8.8 w/ gcc 8.5.0
106+
* Rocky Linux 9.2 w/ gcc 11.3.1
107+
* Ubuntu 20.04 w/ gcc 9.4.0
108+
* Ubuntu 22.04 w/ gcc 11.3.0
109+
* Microsoft Visual Studio 2013, 2015, 2017 and 2019
93110

94111
A complete compatibility matrix for both Apache Cassandra®
95112
and DataStax Enterprise can be found [here][cpp-driver-compatability-matrix].
@@ -105,8 +122,8 @@ __Disclaimer__: DataStax products do not support big-endian systems.
105122

106123
## Getting Help
107124

108-
* JIRA: https://datastax-oss.atlassian.net/browse/CPP
109-
* Mailing List: https://groups.google.com/a/lists.datastax.com/forum/#!forum/cpp-driver-user
125+
* JIRA: [jira]
126+
* Mailing List: [mailing list]
110127

111128
## Examples
112129

@@ -207,20 +224,15 @@ specific language governing permissions and limitations under the License.
207224
[Apache Cassandra®]: http://cassandra.apache.org
208225
[DataStax Enterprise]: http://www.datastax.com/products/datastax-enterprise
209226
[Examples]: examples/
210-
[download server]: http://downloads.datastax.com/cpp-driver/
227+
[Artifactory server]: https://datastax.jfrog.io/artifactory/cpp-php-drivers/cpp-driver/builds
211228
[GitHub]: https://github.com/datastax/cpp-driver
212-
[cpp-driver-compatability-matrix]: https://docs.datastax.com/en/developer/driver-matrix/doc/cppDrivers.html#cpp-drivers
229+
[cpp-driver-compatability-matrix]: https://docs.datastax.com/en/driver-matrix/docs/cpp-drivers.html
213230
[Home]: http://docs.datastax.com/en/developer/cpp-driver/latest
214231
[API]: http://docs.datastax.com/en/developer/cpp-driver/latest/api
215232
[Getting Started]: http://docs.datastax.com/en/developer/cpp-driver/latest/topics
216233
[Building]: http://docs.datastax.com/en/developer/cpp-driver/latest/topics/building
217-
[centos-6-dependencies]: http://downloads.datastax.com/cpp-driver/centos/6/dependencies
218-
[centos-7-dependencies]: http://downloads.datastax.com/cpp-driver/centos/7/dependencies
219-
[centos-8-dependencies]: http://downloads.datastax.com/cpp-driver/centos/8/dependencies
220-
[ubuntu-14-04-dependencies]: http://downloads.datastax.com/cpp-driver/ubuntu/14.04/dependencies
221-
[ubuntu-16-04-dependencies]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/dependencies
222-
[ubuntu-18-04-dependencies]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies
223-
[windows-dependencies]: http://downloads.datastax.com/cpp-driver/windows/dependencies
234+
[jira]: https://datastax-oss.atlassian.net/browse/CPP
235+
[mailing list]: https://groups.google.com/a/lists.datastax.com/forum/#!forum/cpp-driver-user
224236
[DataStax Astra]: https://astra.datastax.com
225237
[Kerberos]: https://web.mit.edu/kerberos
226238

appveyor.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ hosts:
3030
cpp-driver.hostname.: 127.254.254.254
3131
environment:
3232
ARTIFACTORY_BASE_URI:
33-
secure: JgzXEe8SETmb1jGeufZM87ov61t4gvBp/Gq0Q9lCfi41fMgV2z/21SiCobd+twf2aV5Wm+hqBLLdDwukT4UmqSWhfyq7S0CbHmaGzTXG3PE=
33+
secure: 5bD6WmK8IFF9jHmEJ75NqryMijhEtC6eRKhA+fYbSFTwCwc9qOAdB1Lpt8CCiaNfD65i3M0rqQYLj3DL3hGTMrBMTqZnVWer5IvowlEWps8=
3434
ARTIFACTORY_USERNAME:
35-
secure: PLLc0JCL9I7y8zw8p9meQhxXGAbyWCjyWO17xKOsyxE=
35+
secure: o2wIBhhU3l2RmYrB+bWAq21iSZahJxHhJKoWKsjadTI=
3636
ARTIFACTORY_PASSWORD:
37-
secure: h28bN22Py3CZPqrWoZWEjIFnpes+kslusCKP1mRYdUqBEf+OO1kFEQTZ9DGD7tuCSIIRDI3Mf9LX8zgUdmdlZA==
37+
secure: npn828fxSYtJ4i/yeONCL7Oc2He42Ti/ohofbykRyBTlQCzIRIUYvh7iO6yqea3uAqjAMc9OtQzjy3CqH8/Vgkdk22lT/ceCfSJIpEtZwrg=
3838
APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true
3939
DRIVER_TYPE: CASS
4040
LIBSSH2_VERSION: 1.9.0
@@ -43,22 +43,6 @@ environment:
4343
OPENSSL_1_1_VERSION: 1.1.1d
4444
ZLIB_VERSION: 1.2.11
4545
matrix:
46-
- CMAKE_GENERATOR: Visual Studio 10 2010
47-
OPENSSL_MAJOR_MINOR: 1.0
48-
VISUAL_STUDIO_INTERNAL_VERSION: 100
49-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
50-
# - CMAKE_GENERATOR: Visual Studio 10 2010
51-
# OPENSSL_MAJOR_MINOR: 1.1
52-
# VISUAL_STUDIO_INTERNAL_VERSION: 100
53-
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
54-
- CMAKE_GENERATOR: Visual Studio 11 2012
55-
OPENSSL_MAJOR_MINOR: 1.0
56-
VISUAL_STUDIO_INTERNAL_VERSION: 110
57-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
58-
# - CMAKE_GENERATOR: Visual Studio 11 2012
59-
# OPENSSL_MAJOR_MINOR: 1.1
60-
# VISUAL_STUDIO_INTERNAL_VERSION: 110
61-
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
6246
- CMAKE_GENERATOR: Visual Studio 12 2013
6347
OPENSSL_MAJOR_MINOR: 1.0
6448
VISUAL_STUDIO_INTERNAL_VERSION: 120

include/cassandra.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#define CASS_VERSION_MAJOR 2
5555
#define CASS_VERSION_MINOR 17
5656
#define CASS_VERSION_PATCH 0
57-
#define CASS_VERSION_SUFFIX "rc1"
57+
#define CASS_VERSION_SUFFIX ""
5858

5959
#ifdef __cplusplus
6060
extern "C" {

topics/building/README.md

Lines changed: 15 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ The DataStax C/C++ Driver for Apache Cassandra and DataStax Products will build
44
on most standard Unix-like and Microsoft Windows platforms. Packages are
55
available for the following platforms:
66

7-
* [CentOS 6][cpp-driver-centos6]
8-
* [CentOS 7][cpp-driver-centos7]
9-
* [CentOS 8][cpp-driver-centos8]
10-
* [Ubuntu 14.04 LTS][cpp-driver-ubuntu14-04]
11-
* [Ubuntu 16.04 LTS][cpp-driver-ubuntu16-04]
12-
* [Ubuntu 18.04 LTS][cpp-driver-ubuntu18-04]
13-
* [Windows][cpp-driver-windows]
7+
* CentOS 7
8+
* Rocky Linux 8.8
9+
* Rocky Linux 9.2
10+
* Ubuntu 20.04
11+
* Ubuntu 22.04
12+
* Windows
1413

1514
__NOTE__: The build procedures only need to be performed for driver development
1615
or if your system doesn't have packages available for download and
@@ -19,13 +18,13 @@ __NOTE__: The build procedures only need to be performed for driver development
1918
## Compatibility
2019

2120
* Architectures: 32-bit (x86) and 64-bit (x64)
22-
* Compilers: GCC 4.1.2+ Clang 3.4+, and MSVC 2010/2012/2013/2015/2017/2019
21+
* Compilers: GCC 4.8.5+ Clang 3.4+, and MSVC 2013/2015/2017/2019
2322

2423
## Dependencies
2524

2625
The C/C++ driver depends on the following software:
2726

28-
* [CMake] v2.6.4+
27+
* [CMake] v2.8.12+
2928
* [libuv] 1.x
3029
* Kerberos v5 ([Heimdal] or [MIT]) \*
3130
* [OpenSSL] v1.0.x or v1.1.x \*\*
@@ -101,16 +100,12 @@ libuv v1.x should be used in order to ensure all features of the C/C++ driver
101100
are available. When using a package manager for your operating system make sure
102101
you install v1.x; if available.
103102

104-
##### CentOS/RHEL and Ubuntu packages
103+
##### CentOS, Rocky and Ubuntu packages
105104

106-
Packages are available from our [download server]:
107-
108-
* [CentOS 6][libuv-centos6]
109-
* [CentOS 7][libuv-centos7]
110-
* [CentOS 8][libuv-centos8]
111-
* [Ubuntu 14.04 LTS][libuv-ubuntu14-04]
112-
* [Ubuntu 16.04 LTS][libuv-ubuntu16-04]
113-
* [Ubuntu 18.04 LTS][libuv-ubuntu18-04]
105+
Packages are available from our [Artifactory server]. Select the driver version,
106+
build and platform and then look for the `dependencies` directory. Note that the
107+
version of libuv available on Ubuntu can be used when building the driver. As a
108+
result we only provide packages for CentOS and Rocky.
114109

115110
##### Mac OS (Brew)
116111

@@ -255,7 +250,7 @@ cmake -DCASS_BUILD_UNIT_TESTS=On ..
255250

256251
## Windows
257252

258-
The driver is known to build with Visual Studio 2010, 2012, 2013, 2015, 2017, and 2019.
253+
The driver is known to build with Visual Studio 2013, 2015, 2017, and 2019.
259254

260255
### Obtaining build dependencies
261256

@@ -278,8 +273,6 @@ First you will need to open a "Command Prompt" to execute the CMake commands.
278273
#### Building the C/C++ driver
279274

280275
Supported generators are:
281-
* Visual Studio 10 2010
282-
* Visual Studio 11 2012
283276
* Visual Studio 12 2013
284277
* Visual Studio 14 2015
285278
* Visual Studio 15 2017
@@ -329,20 +322,7 @@ cmake -G "Visual Studio 16 2019" -A x64 -DCASS_BUILD_INTEGRATION_TESTS=On ..
329322
cmake -G "Visual Studio 16 2019" -A x64 -DCASS_BUILD_UNIT_TESTS=On ..
330323
```
331324

332-
[download server]: http://downloads.datastax.com
333-
[cpp-driver-centos6]: http://downloads.datastax.com/cpp-driver/centos/6/cassandra
334-
[cpp-driver-centos7]: http://downloads.datastax.com/cpp-driver/centos/7/cassandra
335-
[cpp-driver-centos8]: http://downloads.datastax.com/cpp-driver/centos/8/cassandra
336-
[cpp-driver-ubuntu14-04]: http://downloads.datastax.com/cpp-driver/ubuntu/14.04/cassandra
337-
[cpp-driver-ubuntu16-04]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/cassandra
338-
[cpp-driver-ubuntu18-04]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra
339-
[cpp-driver-windows]: http://downloads.datastax.com/cpp-driver/windows/cassandra
340-
[libuv-centos6]: http://downloads.datastax.com/cpp-driver/centos/6/dependencies/libuv
341-
[libuv-centos7]: http://downloads.datastax.com/cpp-driver/centos/7/dependencies/libuv
342-
[libuv-centos8]: http://downloads.datastax.com/cpp-driver/centos/8/dependencies/libuv
343-
[libuv-ubuntu14-04]: http://downloads.datastax.com/cpp-driver/ubuntu/14.04/dependencies/libuv
344-
[libuv-ubuntu16-04]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/dependencies/libuv
345-
[libuv-ubuntu18-04]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv
325+
[Artifactory server]: https://datastax.jfrog.io/artifactory/cpp-php-drivers/cpp-driver/builds
346326
[Homebrew]: https://brew.sh
347327
[Bison]: http://gnuwin32.sourceforge.net/downlinks/bison.php
348328
[CMake]: http://www.cmake.org/download

0 commit comments

Comments
 (0)