Skip to content

Commit 3583a86

Browse files
authored
CXX-3363 bump required C driver to 2.1.2 (#1473)
* require C driver 2.1.2 * regenerate SBOM-lite * update augmented SBOM from Evergreen * update tested file checks to `bson.h` * `bson-config.h` was renamed in CDRIVER-4153. * fix tag in SBOM * There is no `v` prefix in the C driver release tags.
1 parent f0f72d5 commit 3583a86

File tree

10 files changed

+30
-29
lines changed

10 files changed

+30
-29
lines changed

.evergreen/config_generator/components/funcs/install_c_driver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# - the default value of --c-driver-build-ref in etc/make_release.py
1313
# If pinning to an unreleased commit, create a "Blocked" JIRA ticket with
1414
# a "depends on" link to the appropriate C Driver version release ticket.
15-
MONGOC_VERSION_MINIMUM = '912209d5dc985758bc3d70b105dc5166e3ded7c3' # TODO: bump to 2.1.0 once released.
15+
MONGOC_VERSION_MINIMUM = '2.1.2'
1616

1717

1818
class InstallCDriver(Function):

.evergreen/generated_configs/functions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ functions:
391391
type: setup
392392
params:
393393
updates:
394-
- { key: mongoc_version_minimum, value: 912209d5dc985758bc3d70b105dc5166e3ded7c3 }
394+
- { key: mongoc_version_minimum, value: 2.1.2 }
395395
- command: subprocess.exec
396396
type: setup
397397
params:

.evergreen/scripts/cmake-compat.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ printf " - %s\n" "${cmake_flags[@]:?}"
5353
cmake -S . -B build "${cmake_flags[@]:?}"
5454
cmake --build build --target install
5555

56-
# Use generated header bson-config.h to detect installation of C Driver libraries.
57-
bson_config_h="$(find install -name 'bson-config.h')"
58-
if [[ "${INSTALL_C_DRIVER:?}" == 1 ]] && [[ -n "${bson_config_h:-}" ]]; then
59-
echo "bson-config.h SHOULD NOT be present in $(pwd)/install" >&2
56+
# Use header bson.h to detect installation of C Driver libraries.
57+
bson_h="$(find install -name 'bson.h')"
58+
if [[ "${INSTALL_C_DRIVER:?}" == 1 ]] && [[ -n "${bson_h:-}" ]]; then
59+
echo "bson.h SHOULD NOT be present in $(pwd)/install" >&2
6060
exit 1
6161
fi
62-
if [[ "${INSTALL_C_DRIVER:?}" != 1 ]] && [[ -z "${bson_config_h:-}" ]]; then
63-
echo "bson-config.h SHOULD be present in $(pwd)/install" >&2
62+
if [[ "${INSTALL_C_DRIVER:?}" != 1 ]] && [[ -z "${bson_h:-}" ]]; then
63+
echo "bson.h SHOULD be present in $(pwd)/install" >&2
6464
exit 1
6565
fi

.evergreen/scripts/compile.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,9 @@ if [[ "${_RUN_DISTCHECK:-}" ]]; then
309309
cmake --build . --config "${build_type:?}" --target distcheck
310310
fi
311311

312-
if [[ -n "$(find "${mongoc_prefix:?}" -name 'bson-config.h')" ]]; then
312+
if [[ -n "$(find "${mongoc_prefix:?}" -name 'bson.h')" ]]; then
313313
: # Used install-c-driver.sh.
314-
elif [[ -n "$(find install -name 'bson-config.h')" ]]; then
314+
elif [[ -n "$(find install -name 'bson.h')" ]]; then
315315
: # Used auto-downloaded C Driver.
316316
else
317317
echo "unexpectedly compiled using a system mongoc library" 1>&2

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
3636
- MSVC 19.0.24210 with Visual Studio 2015 Update 3 (from MSVC 19.0.23506 with Visual Studio 2015 Update 1).
3737
- `mongocxx::v_noabi::instance::~instance()` no longer skips calling `mongoc_cleanup()` when compiled with ASAN enabled.
3838
- See https://github.com/google/sanitizers/issues/89 for context.
39+
- Bump the minimum required C Driver version to [2.1.2](https://github.com/mongodb/mongo-c-driver/releases/tag/2.1.2).
3940

4041
### Deprecated
4142

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ else()
5757
endif()
5858

5959
# Also update etc/purls.txt.
60-
set(BSON_REQUIRED_VERSION 2.0.2)
61-
set(MONGOC_REQUIRED_VERSION 2.0.2)
62-
set(MONGOC_DOWNLOAD_VERSION 2.0.2)
60+
set(BSON_REQUIRED_VERSION 2.1.2)
61+
set(MONGOC_REQUIRED_VERSION 2.1.2)
62+
set(MONGOC_DOWNLOAD_VERSION 2.1.2)
6363

6464
# All of our target compilers support the deprecated
6565
# attribute. Normally, we would just let the GenerateExportHeader

etc/augmented.sbom.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"components": [
33
{
4-
"bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2",
4+
"bom-ref": "pkg:github/mongodb/mongo-c-driver@2.1.2",
55
"copyright": "Copyright 2009-present MongoDB, Inc.",
66
"externalReferences": [
77
{
88
"type": "distribution",
9-
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.0.2.tar.gz"
9+
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/2.1.2.tar.gz"
1010
},
1111
{
1212
"type": "website",
13-
"url": "https://github.com/mongodb/mongo-c-driver/tree/v2.0.2"
13+
"url": "https://github.com/mongodb/mongo-c-driver/tree/2.1.2"
1414
}
1515
],
1616
"group": "mongodb",
@@ -22,18 +22,18 @@
2222
}
2323
],
2424
"name": "mongo-c-driver",
25-
"purl": "pkg:github/mongodb/mongo-c-driver@v2.0.2",
25+
"purl": "pkg:github/mongodb/mongo-c-driver@2.1.2",
2626
"type": "library",
27-
"version": "v2.0.2"
27+
"version": "2.1.2"
2828
}
2929
],
3030
"dependencies": [
3131
{
32-
"ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2"
32+
"ref": "pkg:github/mongodb/mongo-c-driver@2.1.2"
3333
}
3434
],
3535
"metadata": {
36-
"timestamp": "2025-09-30T19:07:03.964583+00:00",
36+
"timestamp": "2025-10-07T17:27:33.460808+00:00",
3737
"tools": [
3838
{
3939
"externalReferences": [

etc/cyclonedx.sbom.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"components": [
33
{
4-
"bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2",
4+
"bom-ref": "pkg:github/mongodb/mongo-c-driver@2.1.2",
55
"copyright": "Copyright 2009-present MongoDB, Inc.",
66
"externalReferences": [
77
{
88
"type": "distribution",
9-
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.0.2.tar.gz"
9+
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/2.1.2.tar.gz"
1010
},
1111
{
1212
"type": "website",
13-
"url": "https://github.com/mongodb/mongo-c-driver/tree/v2.0.2"
13+
"url": "https://github.com/mongodb/mongo-c-driver/tree/2.1.2"
1414
}
1515
],
1616
"group": "mongodb",
@@ -22,18 +22,18 @@
2222
}
2323
],
2424
"name": "mongo-c-driver",
25-
"purl": "pkg:github/mongodb/mongo-c-driver@v2.0.2",
25+
"purl": "pkg:github/mongodb/mongo-c-driver@2.1.2",
2626
"type": "library",
27-
"version": "v2.0.2"
27+
"version": "2.1.2"
2828
}
2929
],
3030
"dependencies": [
3131
{
32-
"ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2"
32+
"ref": "pkg:github/mongodb/mongo-c-driver@2.1.2"
3333
}
3434
],
3535
"metadata": {
36-
"timestamp": "2025-09-30T19:07:03.964583+00:00",
36+
"timestamp": "2025-10-07T17:27:33.460808+00:00",
3737
"tools": [
3838
{
3939
"externalReferences": [

etc/make_release.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
)
101101
@click.option(
102102
'--c-driver-build-ref',
103-
default='2.0.2',
103+
default='2.1.2',
104104
show_default=True,
105105
help='When building the C driver, build at this Git reference',
106106
)

etc/purls.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# re-generate the SBOM JSON file!
77

88
# bson and mongoc may be obtained via cmake/FetchMongoC.cmake.
9-
pkg:github/mongodb/mongo-c-driver@v2.0.2
9+
pkg:github/mongodb/mongo-c-driver@2.1.2

0 commit comments

Comments
 (0)