Merge branch '2.2.x'

Closes gh-21100

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

@@ -973,6 +973,15 @@
       "name": "management.endpoints.jmx.exposure.include",
       "defaultValue": "*"
     },
+    {
+      "name": "management.endpoints.jmx.unique-names",
+      "type": "java.lang.Boolean",
+      "description": "Whether unique runtime object names should be ensured.",
+      "deprecation": {
+        "replacement": "spring.jmx.unique-names",
+        "level": "error"
+      }
+    },
     {
       "name": "management.endpoints.web.exposure.include",
       "defaultValue": [
@@ -1025,6 +1034,22 @@
       "description": "Whether to enable Elasticsearch health check.",
       "defaultValue": true
     },
+    {
+      "name": "management.health.elasticsearch.indices",
+      "type": "java.util.List<java.lang.String>",
+      "description": "Comma-separated index names.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "management.health.elasticsearch.response-timeout",
+      "type": "java.time.Duration",
+      "description": "Time to wait for a response from the cluster.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "management.health.influxdb.enabled",
       "type": "java.lang.Boolean",
@@ -1275,6 +1300,14 @@
       "description": "Whether exporting of metrics to JMX is enabled.",
       "defaultValue": true
     },
+    {
+      "name": "management.metrics.export.kairos.num-threads",
+      "type": "java.lang.Integer",
+      "description": "Number of threads to use with the metrics publishing scheduler.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "management.metrics.export.newrelic.num-threads",
       "type": "java.lang.Integer",
@@ -1368,6 +1401,22 @@
       "description": "Whether percentile histograms should be published.",
       "defaultValue": false
     },
+    {
+      "name": "management.metrics.web.client.requests-metric-name",
+      "type": "java.lang.String",
+      "deprecation": {
+        "replacement": "management.metrics.web.client.request.metric-name",
+        "level": "error"
+      }
+    },
+    {
+      "name": "management.metrics.web.server.auto-time-requests",
+      "type": "java.lang.Boolean",
+      "deprecation": {
+        "replacement": "management.metrics.web.server.request.autotime.enabled"
+        "level": "error"
+      }
+    },
     {
       "name": "management.metrics.web.server.request.autotime.enabled",
       "description": "Whether to automatically time web server requests.",
@@ -1382,6 +1431,14 @@
       "description": "Whether percentile histograms should be published.",
       "defaultValue": false
     },
+    {
+      "name": "management.metrics.web.server.requests-metric-name",
+      "type": "java.lang.String",
+      "deprecation": {
+        "replacement": "management.metrics.web.server.request.metric-name",
+        "level": "error"
+      }
+    },
     {
       "name": "management.port",
       "type": "java.lang.Integer",

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

@@ -1206,6 +1206,14 @@
         "level": "error"
       }
     },
+    {
+      "name": "spring.data.cassandra.load-balancing-policy",
+      "type": "java.lang.Class",
+      "description": "Class name of the load balancing policy. The class must have a default constructor.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.data.cassandra.pool.max-queue-size",
       "type": "java.lang.Integer",
@@ -1241,6 +1249,14 @@
         "level": "error"
       }
     },
+    {
+      "name": "spring.data.cassandra.reconnection-policy",
+      "type": "java.lang.Class",
+      "description": "Class name of the reconnection policy. The class must have a default constructor.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.data.cassandra.repositories.enabled",
       "type": "java.lang.Boolean",
@@ -1257,6 +1273,14 @@
       "description": "Type of Cassandra repositories to enable.",
       "defaultValue": "auto"
     },
+    {
+      "name": "spring.data.cassandra.retry-policy",
+      "type": "java.lang.Class",
+      "description": "Class name of the retry policy. The class must have a default constructor.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.data.cassandra.throttler.type",
       "defaultValue": "none"
@@ -1284,6 +1308,30 @@
       "description": "Type of Couchbase repositories to enable.",
       "defaultValue": "auto"
     },
+    {
+      "name": "spring.data.elasticsearch.cluster-name",
+      "type": "java.lang.String",
+      "description": "Elasticsearch cluster name.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "spring.data.elasticsearch.cluster-nodes",
+      "type": "java.lang.String",
+      "description": "Comma-separated list of cluster node addresses.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "spring.data.elasticsearch.properties",
+      "type": "java.util.Map<java.lang.String,java.lang.String>",
+      "description": "Additional properties used to configure the client.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.data.elasticsearch.repositories.enabled",
       "type": "java.lang.Boolean",
@@ -1407,6 +1455,71 @@
         "replacement": "spring.datasource.tomcat.jmx-enabled"
       }
     },
+    {
+      "name": "spring.elasticsearch.jest.connection-timeout",
+      "type": "java.time.Duration",
+      "description": "Connection timeout.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "spring.elasticsearch.jest.multi-threaded",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable connection requests from multiple execution threads.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "spring.elasticsearch.jest.password",
+      "type": "java.lang.String",
+      "description": "Login password.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "spring.elasticsearch.jest.proxy.host",
+      "type": "java.lang.String",
+      "description": "Proxy host the HTTP client should use.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "spring.elasticsearch.jest.proxy.port",
+      "type": "java.lang.Integer",
+      "description": "Proxy port the HTTP client should use.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "spring.elasticsearch.jest.read-timeout",
+      "type": "java.time.Duration",
+      "description": "Read timeout.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "spring.elasticsearch.jest.uris",
+      "type": "java.util.List<java.lang.String>",
+      "description": "Comma-separated list of the Elasticsearch instances to use.",
+      "deprecation": {
+        "replacement": "spring.elasticsearch.rest.uris",
+        "level": "error"
+      }
+    },
+    {
+      "name": "spring.elasticsearch.jest.username",
+      "type": "java.lang.String",
+      "description": "Login username.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.elasticsearch.rest.uris",
       "defaultValue": [
@@ -1632,6 +1745,14 @@
       "name": "spring.integration.jdbc.initialize-schema",
       "defaultValue": "embedded"
     },
+    {
+      "name": "spring.jackson.joda-date-time-format",
+      "type": "java.lang.String",
+      "description": "Joda date time format string. If not configured, \"date-format\" is used as a fallback if it is configured with a format string.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.jersey.type",
       "defaultValue": "servlet"
@@ -2068,6 +2189,14 @@
         "level": "error"
       }
     },
+    {
+      "name": "spring.kafka.streams.cache-max-bytes-buffering",
+      "type": "java.lang.Integer",
+      "deprecation": {
+        "replacement": "spring.kafka.streams.cache-max-size-buffering",
+        "level": "error"
+      }
+    },
     {
       "name": "spring.liquibase.check-change-log-location",
       "type": "java.lang.Boolean",
@@ -2113,6 +2242,14 @@
       "type": "java.lang.String",
       "description": "Preferred JSON mapper to use for HTTP message conversion. By default, auto-detected according to the environment."
     },
+    {
+      "name": "spring.mvc.favicon.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable resolution of favicon.ico.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.mvc.formcontent.filter.enabled",
       "type": "java.lang.Boolean",
@@ -2182,10 +2319,32 @@
       "description": "Whether to create an AmqpAdmin bean.",
       "defaultValue": true
     },
+    {
+      "name": "spring.rabbitmq.listener.simple.transaction-size",
+      "type": "java.lang.Integer",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.rabbitmq.listener.type",
       "defaultValue": "simple"
     },
+    {
+      "name": "spring.rabbitmq.publisher-confirms",
+      "type": "java.lang.Boolean",
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "spring.rabbitmq.template.queue",
+      "type": "java.lang.String",
+      "deprecation": {
+        "replacement": "spring.rabbitmq.template.default-receive-queue",
+        "level": "error"
+      }
+    },
     {
       "name": "spring.reactor.stacktrace-mode.enabled",
       "description": "Whether Reactor should collect stacktrace information at runtime.",