mirror of
https://github.com/spring-projects/spring-boot.git
synced 2026-09-17 12:09:16 +00:00
Merge branch '4.0.x'
This commit is contained in:
Stéphane Nicoll
+1
-1
@@ -54,7 +54,7 @@
|
||||
"messages"
|
||||
]
|
||||
},
|
||||
{
|
||||
{
|
||||
"name": "spring.resources.add-mappings",
|
||||
"type": "java.lang.Boolean",
|
||||
"deprecation": {
|
||||
|
||||
+1
-1
@@ -807,7 +807,7 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
{
|
||||
"name": "logging.structured.json.stacktrace.printer",
|
||||
"values": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -95,4 +95,4 @@
|
||||
"defaultValue": true
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -66,4 +66,4 @@
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -38,4 +38,4 @@
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -7,4 +7,4 @@
|
||||
"defaultValue": true
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"properties": [
|
||||
{
|
||||
{
|
||||
"name": "management.health.mongo.enabled",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
@@ -43,4 +43,4 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -114,4 +114,4 @@
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -210,4 +210,4 @@
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -66,8 +66,8 @@
|
||||
}
|
||||
],
|
||||
"hints": [
|
||||
{
|
||||
"name": "spring.graphql.cors.allowed-headers",
|
||||
{
|
||||
"name": "spring.graphql.cors.allowed-headers",
|
||||
"values": [
|
||||
{
|
||||
"value": "*"
|
||||
|
||||
-1
@@ -31,6 +31,5 @@
|
||||
"description": "Whether to enable CSRF protection.",
|
||||
"defaultValue": false
|
||||
}
|
||||
|
||||
]
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
{
|
||||
{
|
||||
"properties": [
|
||||
{
|
||||
"name": "spring.http.codecs.preferred-json-mapper",
|
||||
|
||||
+1
-1
@@ -210,4 +210,4 @@
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-2
@@ -6,6 +6,5 @@
|
||||
"defaultValue": true
|
||||
}
|
||||
],
|
||||
"hints": [
|
||||
]
|
||||
"hints": []
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"properties": [
|
||||
{
|
||||
{
|
||||
"name": "spring.kafka.admin.ssl.keystore-location",
|
||||
"type": "org.springframework.core.io.Resource",
|
||||
"description": "Location of the key store file.",
|
||||
@@ -303,4 +303,4 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -7,4 +7,4 @@
|
||||
"defaultValue": true
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -45,4 +45,4 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -15,4 +15,4 @@
|
||||
"defaultValue": false
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -62,7 +62,7 @@
|
||||
"since": "2.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
"name": "management.metrics.export.appoptics.api-token",
|
||||
"type": "java.lang.String",
|
||||
"deprecation": {
|
||||
@@ -1756,7 +1756,7 @@
|
||||
"since": "3.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
"name": "management.metrics.web.server.auto-time-requests",
|
||||
"type": "java.lang.Boolean",
|
||||
"deprecation": {
|
||||
|
||||
+88
-94
@@ -1,96 +1,90 @@
|
||||
{
|
||||
"groups": [],
|
||||
"properties": [
|
||||
{
|
||||
"name": "management.logging.export.otlp.enabled",
|
||||
"type": "java.lang.Boolean",
|
||||
"defaultValue": true,
|
||||
"description": "Whether auto-configuration of logging is enabled to export logs over OTLP."
|
||||
},
|
||||
{
|
||||
"name": "management.opentelemetry.map-environment-variables",
|
||||
"type": "java.lang.Boolean",
|
||||
"defaultValue": true,
|
||||
"description": "Whether to map OpenTelemetry SDK environment variables to Spring Boot configuration properties."
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.compression",
|
||||
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties$Compression",
|
||||
"description": "Method used to compress the payload.",
|
||||
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
|
||||
"defaultValue": "none",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.compression",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.connect-timeout",
|
||||
"type": "java.time.Duration",
|
||||
"description": "Connect timeout for the OTel collector connection.",
|
||||
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
|
||||
"defaultValue": "10s",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.connect-timeout",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.endpoint",
|
||||
"type": "java.lang.String",
|
||||
"description": "URL to the OTel collector's HTTP API.",
|
||||
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.endpoint",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.export.enabled",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.logging.export.otlp.enabled",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.headers",
|
||||
"type": "java.util.Map<java.lang.String,java.lang.String>",
|
||||
"description": "Custom HTTP headers you want to pass to the collector, for example auth headers.",
|
||||
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.headers",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.timeout",
|
||||
"type": "java.time.Duration",
|
||||
"description": "Call timeout for the OTel Collector to process an exported batch of data. This timeout spans the entire call: resolving DNS, connecting, writing the request body, server processing, and reading the response body. If the call requires redirects or retries all must complete within one timeout period.",
|
||||
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
|
||||
"defaultValue": "10s",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.timeout",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.transport",
|
||||
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.Transport",
|
||||
"description": "Transport used to send the logs.",
|
||||
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
|
||||
"defaultValue": "http",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.transport",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
}
|
||||
],
|
||||
"hints": []
|
||||
"groups": [],
|
||||
"properties": [
|
||||
{
|
||||
"name": "management.logging.export.otlp.enabled",
|
||||
"type": "java.lang.Boolean",
|
||||
"defaultValue": true,
|
||||
"description": "Whether auto-configuration of logging is enabled to export logs over OTLP."
|
||||
},
|
||||
{
|
||||
"name": "management.opentelemetry.map-environment-variables",
|
||||
"type": "java.lang.Boolean",
|
||||
"defaultValue": true,
|
||||
"description": "Whether to map OpenTelemetry SDK environment variables to Spring Boot configuration properties."
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.compression",
|
||||
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties$Compression",
|
||||
"description": "Method used to compress the payload.",
|
||||
"defaultValue": "none",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.compression",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.connect-timeout",
|
||||
"type": "java.time.Duration",
|
||||
"description": "Connect timeout for the OTel collector connection.",
|
||||
"defaultValue": "10s",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.connect-timeout",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.endpoint",
|
||||
"type": "java.lang.String",
|
||||
"description": "URL to the OTel collector's HTTP API.",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.endpoint",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.export.enabled",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.logging.export.otlp.enabled",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.headers",
|
||||
"type": "java.util.Map<java.lang.String,java.lang.String>",
|
||||
"description": "Custom HTTP headers you want to pass to the collector, for example auth headers.",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.headers",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.timeout",
|
||||
"type": "java.time.Duration",
|
||||
"description": "Call timeout for the OTel Collector to process an exported batch of data. This timeout spans the entire call: resolving DNS, connecting, writing the request body, server processing, and reading the response body. If the call requires redirects or retries all must complete within one timeout period.",
|
||||
"defaultValue": "10s",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.timeout",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "management.otlp.logging.transport",
|
||||
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.Transport",
|
||||
"description": "Transport used to send the logs.",
|
||||
"defaultValue": "http",
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "management.opentelemetry.logging.export.otlp.transport",
|
||||
"since": "4.0.0"
|
||||
}
|
||||
}
|
||||
],
|
||||
"hints": []
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"groups": [],
|
||||
"properties": [
|
||||
{
|
||||
{
|
||||
"name": "spring.reactor.stacktrace-mode.enabled",
|
||||
"description": "Whether Reactor should collect stacktrace information at runtime.",
|
||||
"defaultValue": false,
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"groups": [],
|
||||
"properties": [
|
||||
{
|
||||
{
|
||||
"name": "spring.security.oauth2.resourceserver.jwt.jws-algorithm",
|
||||
"type": "java.lang.String",
|
||||
"deprecation": {
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"groups": [],
|
||||
"properties": [
|
||||
{
|
||||
{
|
||||
"name": "spring.security.filter.dispatcher-types",
|
||||
"defaultValue": [
|
||||
"async",
|
||||
|
||||
+1
-2
@@ -39,7 +39,6 @@
|
||||
],
|
||||
"hints": [],
|
||||
"ignored": {
|
||||
"properties": [
|
||||
]
|
||||
"properties": []
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -72,7 +72,7 @@
|
||||
{
|
||||
"name": "server.error.whitelabel.enabled",
|
||||
"description": "Whether to enable the default error page displayed in browsers in case of a server error.",
|
||||
"defaultValue": true ,
|
||||
"defaultValue": true,
|
||||
"deprecation": {
|
||||
"level": "error",
|
||||
"replacement": "spring.web.error.whitelabel.enabled",
|
||||
@@ -260,4 +260,4 @@
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user