From d5e18e61c57b98c157bfddde892c36376e99017b Mon Sep 17 00:00:00 2001 From: Felix Scheinost Date: Tue, 12 Jul 2022 12:53:10 +0200 Subject: [PATCH 1/2] Fix deprecation metadata for grid-fs-database See gh-31689 --- ...additional-spring-configuration-metadata.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 7d2333fb69..c6d0bdfaff 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2035,6 +2035,14 @@ "name": "spring.webservices.wsdl-locations", "type": "java.util.List", "description": "Comma-separated list of locations of WSDLs and accompanying XSDs to be exposed as beans." + }, + { + "name": "spring.data.mongodb.grid-fs-database", + "type": "java.lang.String", + "deprecation": { + "replacement": "spring.data.mongodb.gridfs.database", + "level": "error" + } } ], "hints": [ @@ -2174,14 +2182,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": [ From a368919600a5ec7f3d5df11d39e9d96c0fbe4b38 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 12 Jul 2022 14:42:49 +0200 Subject: [PATCH 2/2] Polish "Fix deprecation metadata for grid-fs-database" See gh-31689 --- ...additional-spring-configuration-metadata.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index c6d0bdfaff..90410a6891 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -651,6 +651,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", @@ -2035,14 +2043,6 @@ "name": "spring.webservices.wsdl-locations", "type": "java.util.List", "description": "Comma-separated list of locations of WSDLs and accompanying XSDs to be exposed as beans." - }, - { - "name": "spring.data.mongodb.grid-fs-database", - "type": "java.lang.String", - "deprecation": { - "replacement": "spring.data.mongodb.gridfs.database", - "level": "error" - } } ], "hints": [