Skip to content

Commit c9c018f

Browse files
authored
[v4.1] CXX-3663 bump downloaded C driver to 2.1.2 (#1474)
* bump auto-downloaded version to 2.1.2 * Keep required version the same to avoid a minor version dependency bump in a patch release. * regenerate SBOM-lite * check for `bson.h` * `bson-config.h` was renamed in CDRIVER-4153. Use `bson.h` since it is included directly. * update augmented SBOM from Evergreen task * fix referenced tag in purls.txt * `v2.1.2` to `2.1.2` * get augmented SBOM from Evg
1 parent 85bec6e commit c9c018f

File tree

6 files changed

+25
-23
lines changed

6 files changed

+25
-23
lines changed

.evergreen/scripts/cmake-compat.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ printf " - %s\n" "${cmake_flags[@]:?}"
6161
"${cmake_binary:?}" -S . -B build "${cmake_flags[@]:?}"
6262
"${cmake_binary:?}" --build build --target install
6363

64-
# Use generated header bson-config.h to detect installation of C Driver libraries.
65-
bson_config_h="$(find install -name 'bson-config.h')"
66-
if [[ "${INSTALL_C_DRIVER:?}" == 1 ]] && [[ -n "${bson_config_h:-}" ]]; then
67-
echo "bson-config.h SHOULD NOT be present in $(pwd)/install" >&2
64+
# Use header bson.h to detect installation of C Driver libraries.
65+
bson_h="$(find install -name 'bson.h')"
66+
if [[ "${INSTALL_C_DRIVER:?}" == 1 ]] && [[ -n "${bson_h:-}" ]]; then
67+
echo "bson.h SHOULD NOT be present in $(pwd)/install" >&2
6868
exit 1
6969
fi
70-
if [[ "${INSTALL_C_DRIVER:?}" != 1 ]] && [[ -z "${bson_config_h:-}" ]]; then
71-
echo "bson-config.h SHOULD be present in $(pwd)/install" >&2
70+
if [[ "${INSTALL_C_DRIVER:?}" != 1 ]] && [[ -z "${bson_h:-}" ]]; then
71+
echo "bson.h SHOULD be present in $(pwd)/install" >&2
7272
exit 1
7373
fi

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
99

1010
## 4.1.4 [Unreleased]
1111

12-
<!-- Will contain entries for next patch release -->
12+
### Changed
13+
14+
- Bump the auto-downloaded C Driver version to [2.1.2](https://github.com/mongodb/mongo-c-driver/releases/tag/2.1.2).
1315

1416
## 4.1.3
1517

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ endif()
4747
# Also update etc/purls.txt.
4848
set(BSON_REQUIRED_VERSION 2.0.0)
4949
set(MONGOC_REQUIRED_VERSION 2.0.0)
50-
set(MONGOC_DOWNLOAD_VERSION 2.0.2)
50+
set(MONGOC_DOWNLOAD_VERSION 2.1.2)
5151

5252
# All of our target compilers support the deprecated
5353
# 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-16T15:16:51.915650+00:00",
36+
"timestamp": "2025-10-07T17:23:19.924947+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-16T15:16:51.915650+00:00",
36+
"timestamp": "2025-10-07T17:23:19.924947+00:00",
3737
"tools": [
3838
{
3939
"externalReferences": [

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)