From 909ee5adc66fe8dade54764234edf6d9b9ee8386 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Wed, 12 Feb 2025 14:09:43 -0600 Subject: [PATCH 1/4] CXX-3208 bump minimum C Driver version to 1.30.0 --- .../components/funcs/install_c_driver.py | 2 +- .evergreen/generated_configs/functions.yml | 2 +- CHANGELOG.md | 4 ++++ CMakeLists.txt | 6 +++--- etc/cyclonedx.sbom.json | 16 ++++++++-------- etc/make_release.py | 2 +- etc/purls.txt | 2 +- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.evergreen/config_generator/components/funcs/install_c_driver.py b/.evergreen/config_generator/components/funcs/install_c_driver.py index 935f8ed5d2..654357c69c 100644 --- a/.evergreen/config_generator/components/funcs/install_c_driver.py +++ b/.evergreen/config_generator/components/funcs/install_c_driver.py @@ -14,7 +14,7 @@ # Only LIBMONGOC_DOWNLOAD_VERSION needs to be updated when pinning to an unreleased commit. # If pinning to an unreleased commit, create a "Blocked" JIRA ticket with # a "depends on" link to the appropriate C Driver version release ticket. -MONGOC_VERSION_MINIMUM = 'f2c1bb7989177fa2ddba1a915e8423e46ee1defe' # CXX-3208: bump to 1.30.0 once released. +MONGOC_VERSION_MINIMUM = '1.30.0' class InstallCDriver(Function): diff --git a/.evergreen/generated_configs/functions.yml b/.evergreen/generated_configs/functions.yml index 856e19bc1f..d5c0a69b0d 100644 --- a/.evergreen/generated_configs/functions.yml +++ b/.evergreen/generated_configs/functions.yml @@ -375,7 +375,7 @@ functions: type: setup params: updates: - - { key: mongoc_version_minimum, value: f2c1bb7989177fa2ddba1a915e8423e46ee1defe } + - { key: mongoc_version_minimum, value: 1.30.0 } - command: subprocess.exec type: setup params: diff --git a/CHANGELOG.md b/CHANGELOG.md index 99bc08f433..0515e33b87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu - Support for MacOS 11 (EOL since Nov 2020) and MacOS 12 (EOL since Oct 2021). +### Changed + +- Bump the minimum required C Driver version to [1.30.0](https://github.com/mongodb/ongo-c-driver/releases/tag/1.30.0). + ## 4.0.0 ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index db690b8745..d93b0be186 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,12 +49,12 @@ else() endif() # Also update etc/purls.txt. -set(LIBBSON_REQUIRED_VERSION 1.29.0) +set(LIBBSON_REQUIRED_VERSION 1.30.0) set(LIBBSON_REQUIRED_ABI_VERSION 1.0) # Also update etc/purls.txt. -set(LIBMONGOC_REQUIRED_VERSION 1.29.0) -set(LIBMONGOC_DOWNLOAD_VERSION f2c1bb7989177fa2ddba1a915e8423e46ee1defe) +set(LIBMONGOC_REQUIRED_VERSION 1.30.0) +set(LIBMONGOC_DOWNLOAD_VERSION 1.30.0) set(LIBMONGOC_REQUIRED_ABI_VERSION 1.0) set(NEED_DOWNLOAD_C_DRIVER false) diff --git a/etc/cyclonedx.sbom.json b/etc/cyclonedx.sbom.json index 073dbceff4..142cf9e774 100644 --- a/etc/cyclonedx.sbom.json +++ b/etc/cyclonedx.sbom.json @@ -1,16 +1,16 @@ { "components": [ { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@v1.29.0", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@v1.30.0", "copyright": "Copyright 2009-present MongoDB, Inc.", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v1.29.0.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v1.30.0.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/v1.29.0" + "url": "https://github.com/mongodb/mongo-c-driver/tree/v1.30.0" } ], "group": "mongodb", @@ -22,18 +22,18 @@ } ], "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@v1.29.0", + "purl": "pkg:github/mongodb/mongo-c-driver@v1.30.0", "type": "library", - "version": "v1.29.0" + "version": "v1.30.0" } ], "dependencies": [ { - "ref": "pkg:github/mongodb/mongo-c-driver@v1.29.0" + "ref": "pkg:github/mongodb/mongo-c-driver@v1.30.0" } ], "metadata": { - "timestamp": "2024-11-19T18:14:12.160074+00:00", + "timestamp": "2025-02-12T20:06:56.562655+00:00", "tools": [ { "externalReferences": [ @@ -77,7 +77,7 @@ ] }, "serialNumber": "urn:uuid:dd68fbb0-f77c-4bb9-90cd-606dd854f301", - "version": 5, + "version": 6, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.5", diff --git a/etc/make_release.py b/etc/make_release.py index 9be48ca434..28b611cb48 100755 --- a/etc/make_release.py +++ b/etc/make_release.py @@ -88,7 +88,7 @@ show_default=True, help='The remote reference which points to the mongodb/mongo-cxx-driver repo') @click.option('--c-driver-build-ref', - default='1.29.0', + default='1.30.0', show_default=True, help='When building the C driver, build at this Git reference') @click.option('--with-c-driver', diff --git a/etc/purls.txt b/etc/purls.txt index e3f180b5d0..ac3dda9026 100644 --- a/etc/purls.txt +++ b/etc/purls.txt @@ -6,4 +6,4 @@ # re-generate the SBOM JSON file! # libbson and libmongoc are obtained via cmake/FetchMongoC.cmake. -pkg:github/mongodb/mongo-c-driver@v1.29.0 +pkg:github/mongodb/mongo-c-driver@v1.30.0 From f2aec119722a8a04fa969224b60b96e662bdc4ce Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Wed, 12 Feb 2025 14:28:06 -0600 Subject: [PATCH 2/4] Update Silk commands to use silkbomb:1.1 --- etc/releasing.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/etc/releasing.md b/etc/releasing.md index 941a0aa042..1e5da4c8c1 100644 --- a/etc/releasing.md +++ b/etc/releasing.md @@ -139,13 +139,13 @@ If `etc/purls.txt` was updated, update the SBOM Lite document using the followin podman login --password-stdin --username "${ARTIFACTORY_USER:?}" artifactory.corp.mongodb.com <<<"${ARTIFACTORY_PASSWORD:?}" # Ensure latest version of SilkBomb is being used. -podman pull artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 +podman pull artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.1 # Output: "... writing sbom to file" podman run \ --env-file "$HOME/.secrets/silk-creds.txt" \ -it --rm -v "$(pwd):/pwd" \ - artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 \ + artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.1 \ update -p "/pwd/etc/purls.txt" -i "/pwd/etc/cyclonedx.sbom.json" -o "/pwd/etc/cyclonedx.sbom.json" ``` @@ -173,13 +173,13 @@ Update the Augmented SBOM document using the following command(s): podman login --password-stdin --username "${ARTIFACTORY_USER:?}" artifactory.corp.mongodb.com <<<"${ARTIFACTORY_PASSWORD:?}" # Ensure latest version of SilkBomb is being used. -podman pull artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 +podman pull artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.1 # Output: "... writing sbom to file" podman run \ --env-file "$HOME/.secrets/silk-creds.txt" \ -it --rm -v "$(pwd):/pwd" \ - artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 \ + artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.1 \ download --silk-asset-group "mongo-cxx-driver" -o "/pwd/etc/augmented.sbom.json" ``` @@ -201,26 +201,26 @@ If the Augmented SBOM has not yet been updated in time for a release, a temporar . $HOME/.secrets/silk-creds.txt # Name of the temporary Silk Asset Group. Do NOT use an existing Silk Asset Group! -asset_group_id="mongo-cxx-driver-X.Y.Z-tmp" +asset_group_id="mongo-cxx-driver-tmp-releasing" # Output: "Login succeeded!" podman login --password-stdin --username "${ARTIFACTORY_USER:?}" artifactory.corp.mongodb.com <<<"${ARTIFACTORY_PASSWORD:?}" # Ensure latest version of SilkBomb is being used. -podman pull artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 +podman pull artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.1 # Common flags to podman. silkbomb_flags=( --env-file "$HOME/.secrets/silk-creds.txt" -it --rm -v "$(pwd):/pwd" - artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 + artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.1 ) # Create a new and temporary Silk Asset Group. podman run "${silkbomb_flags[@]:?}" asset-group --asset-cmd create --silk-asset-group "${asset_group_id:?}" --name "${asset_group_id:?}" # Upload the SBOM Lite. -podman run "${silkbomb_flags[@]:?}" upload --silk-asset-group "${asset_group_id:?}" -i /pwd/etc/cyclonedx.sbom.json -o /pwd/etc/cyclonedx.sbom.json +podman run "${silkbomb_flags[@]:?}" upload --silk-asset-group "${asset_group_id:?}" -i /pwd/etc/cyclonedx.sbom.json # Download the Augmented SBOM. podman run "${silkbomb_flags[@]:?}" download --silk-asset-group "${asset_group_id:?}" -o /pwd/etc/augmented.sbom.json From f81168ac4175875adea5e89222319e1a9ab3a46f Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Wed, 12 Feb 2025 14:28:06 -0600 Subject: [PATCH 3/4] Also update the Augmented SBOM --- etc/augmented.sbom.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/etc/augmented.sbom.json b/etc/augmented.sbom.json index 073dbceff4..4cb5596252 100644 --- a/etc/augmented.sbom.json +++ b/etc/augmented.sbom.json @@ -1,16 +1,16 @@ { "components": [ { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@v1.29.0", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@v1.30.0", "copyright": "Copyright 2009-present MongoDB, Inc.", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v1.29.0.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v1.30.0.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/v1.29.0" + "url": "https://github.com/mongodb/mongo-c-driver/tree/v1.30.0" } ], "group": "mongodb", @@ -22,18 +22,18 @@ } ], "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@v1.29.0", + "purl": "pkg:github/mongodb/mongo-c-driver@v1.30.0", "type": "library", - "version": "v1.29.0" + "version": "v1.30.0" } ], "dependencies": [ { - "ref": "pkg:github/mongodb/mongo-c-driver@v1.29.0" + "ref": "pkg:github/mongodb/mongo-c-driver@v1.30.0" } ], "metadata": { - "timestamp": "2024-11-19T18:14:12.160074+00:00", + "timestamp": "2025-02-12T20:25:30.226005+00:00", "tools": [ { "externalReferences": [ @@ -77,7 +77,7 @@ ] }, "serialNumber": "urn:uuid:dd68fbb0-f77c-4bb9-90cd-606dd854f301", - "version": 5, + "version": 6, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.5", From 5602cb42de6cfee01a0b3ae6531ed45711c9d4a0 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Wed, 12 Feb 2025 14:28:06 -0600 Subject: [PATCH 4/4] Fix typo in url --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0515e33b87..55ed5b0a78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu ### Changed -- Bump the minimum required C Driver version to [1.30.0](https://github.com/mongodb/ongo-c-driver/releases/tag/1.30.0). +- Bump the minimum required C Driver version to [1.30.0](https://github.com/mongodb/mongo-c-driver/releases/tag/1.30.0). ## 4.0.0