root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x 

Closes gh-31690
This commit is contained in:
Stephane Nicoll 2022-07-12 14:51:33 +02:00
parent 77f1f5869b 77ecdc6ba5
commit cb2844d527
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -703,6 +703,14 @@
"description": "Whether to enable LDAP repositories.", "description": "Whether to enable LDAP repositories.",
"defaultValue": true "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", "name": "spring.data.mongodb.repositories.type",
"type": "org.springframework.boot.autoconfigure.data.RepositoryType", "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", "name": "spring.datasource.data",
"providers": [ "providers": [