diff --git a/.evergreen/generated_configs/functions.yml b/.evergreen/generated_configs/functions.yml index e613a09d86..25a9dba4f0 100644 --- a/.evergreen/generated_configs/functions.yml +++ b/.evergreen/generated_configs/functions.yml @@ -506,7 +506,7 @@ functions: type: setup params: updates: - - { key: mongoc_version_minimum, value: 2.0.0 } + - { key: mongoc_version_minimum, value: 2.0.2 } - command: subprocess.exec type: setup params: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a786353dc..759f4012dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,9 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu ## 4.1.3 [Unreleased] - +### Changed + +- Bump the auto-downloaded C Driver version to [2.0.2](https://github.com/mongodb/mongo-c-driver/releases/tag/2.0.2). ## 4.1.2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6caee2052f..e35770d609 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,7 @@ endif() # Also update etc/purls.txt. set(BSON_REQUIRED_VERSION 2.0.0) set(MONGOC_REQUIRED_VERSION 2.0.0) -set(MONGOC_DOWNLOAD_VERSION 2.0.0) +set(MONGOC_DOWNLOAD_VERSION 2.0.2) # All of our target compilers support the deprecated # attribute. Normally, we would just let the GenerateExportHeader diff --git a/etc/augmented.sbom.json b/etc/augmented.sbom.json index 852b043a97..b19ee992b3 100644 --- a/etc/augmented.sbom.json +++ b/etc/augmented.sbom.json @@ -1,16 +1,16 @@ { "components": [ { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.0.0", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2", "copyright": "Copyright 2009-present MongoDB, Inc.", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.0.0.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.0.2.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/v2.0.0" + "url": "https://github.com/mongodb/mongo-c-driver/tree/v2.0.2" } ], "group": "mongodb", @@ -22,18 +22,18 @@ } ], "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@v2.0.0", + "purl": "pkg:github/mongodb/mongo-c-driver@v2.0.2", "type": "library", - "version": "v2.0.0" + "version": "v2.0.2" } ], "dependencies": [ { - "ref": "pkg:github/mongodb/mongo-c-driver@v2.0.0" + "ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2" } ], "metadata": { - "timestamp": "2025-05-01T19:59:22.023435+00:00", + "timestamp": "2025-09-16T15:16:51.915650+00:00", "tools": [ { "externalReferences": [ diff --git a/etc/cyclonedx.sbom.json b/etc/cyclonedx.sbom.json index 852b043a97..b19ee992b3 100644 --- a/etc/cyclonedx.sbom.json +++ b/etc/cyclonedx.sbom.json @@ -1,16 +1,16 @@ { "components": [ { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.0.0", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2", "copyright": "Copyright 2009-present MongoDB, Inc.", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.0.0.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.0.2.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/v2.0.0" + "url": "https://github.com/mongodb/mongo-c-driver/tree/v2.0.2" } ], "group": "mongodb", @@ -22,18 +22,18 @@ } ], "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@v2.0.0", + "purl": "pkg:github/mongodb/mongo-c-driver@v2.0.2", "type": "library", - "version": "v2.0.0" + "version": "v2.0.2" } ], "dependencies": [ { - "ref": "pkg:github/mongodb/mongo-c-driver@v2.0.0" + "ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2" } ], "metadata": { - "timestamp": "2025-05-01T19:59:22.023435+00:00", + "timestamp": "2025-09-16T15:16:51.915650+00:00", "tools": [ { "externalReferences": [ diff --git a/etc/purls.txt b/etc/purls.txt index de138b5cce..ea12d65ef5 100644 --- a/etc/purls.txt +++ b/etc/purls.txt @@ -6,4 +6,4 @@ # re-generate the SBOM JSON file! # bson and mongoc may be obtained via cmake/FetchMongoC.cmake. -pkg:github/mongodb/mongo-c-driver@v2.0.0 +pkg:github/mongodb/mongo-c-driver@v2.0.2 diff --git a/examples/api/bsoncxx/examples/validation/basic_usage.cpp b/examples/api/bsoncxx/examples/validation/basic_usage.cpp index ceaf61f21a..9262e805d8 100644 --- a/examples/api/bsoncxx/examples/validation/basic_usage.cpp +++ b/examples/api/bsoncxx/examples/validation/basic_usage.cpp @@ -61,8 +61,8 @@ void example() { EXPECT(bsoncxx::validate(data, length) == bsoncxx::validate(data, length, options, &offset)); - // Not set when valid. - EXPECT(offset == 123u); + // Set to 0 when valid. + EXPECT(offset == 0u); } } // [Example] diff --git a/examples/api/bsoncxx/examples/validation/validator.cpp b/examples/api/bsoncxx/examples/validation/validator.cpp index fa461abb26..cf677f7db4 100644 --- a/examples/api/bsoncxx/examples/validation/validator.cpp +++ b/examples/api/bsoncxx/examples/validation/validator.cpp @@ -77,8 +77,8 @@ void example(std::uint8_t const* bytes, std::size_t length) { EXPECT(!bsoncxx::validate(bytes, length, options, &offset)); - // Offset of `"$numberInt": "123"` relative to start of the sub-document. (CDRIVER-5710) - EXPECT(offset == 4u); + // Offset of `"$numberInt": "123"` relative to start of the document. + EXPECT(offset == 31u); } } // [Example]