Merge branch '2.3.x' into 2.4.x

See gh-24943
spring-projects · Jan 20, 2021 · 56ce5bd · 56ce5bd
2 parents 85729d2 + 244a6ac
commit 56ce5bd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...t-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...t-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -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",