Merge branch '2.3.x' into 2.4.x

See gh-24943
5 years ago · 56ce5bdf44
1 changed files with 5 additions and 1 deletions
--- 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
@ -748,7 +748,11 @@
				@@ -748,7 +748,11 @@
      "name": "spring.data.solr.repositories.enabled",
      "type": "java.lang.Boolean",
      "description": "Whether to enable Solr repositories.",
-      "defaultValue": true
+      "defaultValue": true,
+      "deprecation": {
+        "reason": "Spring Data Solr is deprecated.",
+        "level": "warning"
+      }
    },
    {
      "name": "spring.datasource.initialization-mode",