Skip to content

CXX-3208 bump minimum C Driver version to 1.30.0 #1331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/generated_configs/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/mongo-c-driver/releases/tag/1.30.0).

## 4.0.0

### Added
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions etc/augmented.sbom.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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": [
Expand Down Expand Up @@ -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",
Expand Down
16 changes: 8 additions & 8 deletions etc/cyclonedx.sbom.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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": [
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion etc/make_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion etc/purls.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 8 additions & 8 deletions etc/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
```

Expand Down Expand Up @@ -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"
```

Expand All @@ -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
Expand Down