Merge branch '2.6.x' into 2.7.x

Closes gh-31690

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -703,6 +703,14 @@
       "description": "Whether to enable LDAP repositories.",
       "defaultValue": true
     },
+    {
+      "name": "spring.data.mongodb.grid-fs-database",
+      "type": "java.lang.String",
+      "deprecation": {
+        "replacement": "spring.data.mongodb.gridfs.database",
+        "level": "error"
+      }
+    },
     {
       "name": "spring.data.mongodb.repositories.type",
       "type": "org.springframework.boot.autoconfigure.data.RepositoryType",
@@ -2305,14 +2313,6 @@
         }
       ]
     },
-    {
-      "name": "spring.data.mongodb.grid-fs-database",
-      "type": "java.lang.String",
-      "deprecation": {
-        "replacement": "spring.data.mongodb.gridfs.database",
-        "level": "error"
-      }
-    },
     {
       "name": "spring.datasource.data",
       "providers": [