Merge branch '2.4.x'

2f4d4c7b · Stephane Nicoll · 7b1db523 · 56ce5bdf · 2f4d4c7b
Commit 2f4d4c7b authored Jan 20, 2021 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

additional-spring-configuration-metadata.json ...es/META-INF/additional-spring-configuration-metadata.json +5 -1

No files found.
--- 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
@@ -752,7 +752,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",