From cd973fe69211ba5d75dcd7637cfe0c2a40e87d3b Mon Sep 17 00:00:00 2001 From: Melanie Ballard Date: Mon, 9 Jun 2025 14:27:47 -0400 Subject: [PATCH 1/2] DOCSP-49013-Java Sync Bom Tips --- .../document-data-format-bson.txt | 6 +++ .../code-snippets/bson-gradle-versioned.rst | 2 +- .../code-snippets/bson-maven-versioned.rst | 1 - .../code-snippets/crypt-gradle-versioned.rst | 2 +- .../code-snippets/crypt-maven-versioned.rst | 1 - source/security/encrypt-fields.txt | 51 +++++++++++-------- 6 files changed, 37 insertions(+), 26 deletions(-) diff --git a/source/data-formats/document-data-format-bson.txt b/source/data-formats/document-data-format-bson.txt index 6572c5ed6..e6cba9dc4 100644 --- a/source/data-formats/document-data-format-bson.txt +++ b/source/data-formats/document-data-format-bson.txt @@ -63,6 +63,12 @@ MongoDB Java driver as a dependency to your project, see the :ref:`driver installation ` section of our Quick Start guide. +.. sharedinclude:: dbx/jvm/BOM-installation-tip.rst + + .. replacement:: installation-guide + + :ref:`Add the Driver Bill of Materials ` step of the Quick Start guide. + We recommend that you use the `Maven `__ or `Gradle `__ build automation tool to manage your project's dependencies. Select from the following tabs to see the dependency declaration diff --git a/source/includes/fundamentals/code-snippets/bson-gradle-versioned.rst b/source/includes/fundamentals/code-snippets/bson-gradle-versioned.rst index 9c2f13004..36aa1ed1f 100644 --- a/source/includes/fundamentals/code-snippets/bson-gradle-versioned.rst +++ b/source/includes/fundamentals/code-snippets/bson-gradle-versioned.rst @@ -1,6 +1,6 @@ .. code-block:: groovy dependencies { - compile 'org.mongodb:bson:{+full-version+}' + compile 'org.mongodb:bson' } diff --git a/source/includes/fundamentals/code-snippets/bson-maven-versioned.rst b/source/includes/fundamentals/code-snippets/bson-maven-versioned.rst index 31e1dd6a2..665cc6f1e 100644 --- a/source/includes/fundamentals/code-snippets/bson-maven-versioned.rst +++ b/source/includes/fundamentals/code-snippets/bson-maven-versioned.rst @@ -4,7 +4,6 @@ org.mongodb bson - {+full-version+} diff --git a/source/includes/fundamentals/code-snippets/crypt-gradle-versioned.rst b/source/includes/fundamentals/code-snippets/crypt-gradle-versioned.rst index 8e23daf84..ccb206b43 100644 --- a/source/includes/fundamentals/code-snippets/crypt-gradle-versioned.rst +++ b/source/includes/fundamentals/code-snippets/crypt-gradle-versioned.rst @@ -1,5 +1,5 @@ .. code-block:: groovy dependencies { - implementation 'org.mongodb:mongodb-crypt:{+mongocrypt-version+}' + implementation 'org.mongodb:mongodb-crypt' } diff --git a/source/includes/fundamentals/code-snippets/crypt-maven-versioned.rst b/source/includes/fundamentals/code-snippets/crypt-maven-versioned.rst index b0bfa3853..9a8f560ba 100644 --- a/source/includes/fundamentals/code-snippets/crypt-maven-versioned.rst +++ b/source/includes/fundamentals/code-snippets/crypt-maven-versioned.rst @@ -4,7 +4,6 @@ org.mongodb mongodb-crypt - {+mongocrypt-version+} diff --git a/source/security/encrypt-fields.txt b/source/security/encrypt-fields.txt index f26de05cf..841ff6eff 100644 --- a/source/security/encrypt-fields.txt +++ b/source/security/encrypt-fields.txt @@ -4,25 +4,32 @@ .. replacement:: driver-specific-content - .. important:: Compatible Encryption Library Version - - The {+driver-short+} uses the `mongodb-crypt - `__ - encryption library for in-use encryption. This driver version - is compatible with ``mongodb-crypt`` v{+mongocrypt-version+}. - - Select from the following :guilabel:`Maven` and - :guilabel:`Gradle` tabs to see how to add the ``mongodb-crypt`` - dependency to your project by using the specified manager: - - .. tabs:: - - .. tab:: Maven - :tabid: maven-dependency - - .. include:: /includes/fundamentals/code-snippets/crypt-maven-versioned.rst - - .. tab:: Gradle - :tabid: gradle-dependency - - .. include:: /includes/fundamentals/code-snippets/crypt-gradle-versioned.rst \ No newline at end of file + Compatible Encryption Library Version + ------------------------------------- + + The {+driver-short+} uses the `mongodb-crypt + `__ + encryption library for in-use encryption. This driver version + is compatible with ``mongodb-crypt`` v{+mongocrypt-version+}. + + .. sharedinclude:: dbx/jvm/BOM-installation-tip.rst + + .. replacement:: installation-guide + + :ref:`Add the Driver Bill of Materials ` step of the Quick Start guide. + + Select from the following :guilabel:`Maven` and + :guilabel:`Gradle` tabs to see how to add the ``mongodb-crypt`` + dependency to your project by using the specified manager: + + .. tabs:: + + .. tab:: Maven + :tabid: maven-dependency + + .. include:: /includes/fundamentals/code-snippets/crypt-maven-versioned.rst + + .. tab:: Gradle + :tabid: gradle-dependency + + .. include:: /includes/fundamentals/code-snippets/crypt-gradle-versioned.rst \ No newline at end of file From 393317d9d727d1b0ca325c29feb2cb6b112863a9 Mon Sep 17 00:00:00 2001 From: Melanie Ballard Date: Mon, 9 Jun 2025 14:34:16 -0400 Subject: [PATCH 2/2] DOCSP-49013 Fixing label of Get Started guide in tip --- source/data-formats/document-data-format-bson.txt | 2 +- source/security/encrypt-fields.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/data-formats/document-data-format-bson.txt b/source/data-formats/document-data-format-bson.txt index e6cba9dc4..683630ccd 100644 --- a/source/data-formats/document-data-format-bson.txt +++ b/source/data-formats/document-data-format-bson.txt @@ -67,7 +67,7 @@ guide. .. replacement:: installation-guide - :ref:`Add the Driver Bill of Materials ` step of the Quick Start guide. + :ref:`Add the Driver Bill of Materials ` step of the Get Started guide. We recommend that you use the `Maven `__ or `Gradle `__ build automation tool to manage your project's diff --git a/source/security/encrypt-fields.txt b/source/security/encrypt-fields.txt index 841ff6eff..1cb55346c 100644 --- a/source/security/encrypt-fields.txt +++ b/source/security/encrypt-fields.txt @@ -16,7 +16,7 @@ .. replacement:: installation-guide - :ref:`Add the Driver Bill of Materials ` step of the Quick Start guide. + :ref:`Add the Driver Bill of Materials ` step of the Get Started guide. Select from the following :guilabel:`Maven` and :guilabel:`Gradle` tabs to see how to add the ``mongodb-crypt``