Skip to content

Commit 85e1ef8

Browse files
committed
Merge branch '4.0.x'
Closes gh-50632
2 parents 5bf2a32 + f6f1d57 commit 85e1ef8

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
},
202202
{
203203
"name": "management.wavefront.api-token-type",
204-
"type": "org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties$TokenType",
204+
"type": "java.lang.String",
205205
"deprecation": {
206206
"level": "error",
207207
"reason": "Wavefront is end-of-life.",

module/spring-boot-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"name": "spring.datasource.initialization-mode",
53-
"type": "org.springframework.boot.jdbc.DataSourceInitializationMode",
53+
"type": "org.springframework.boot.sql.init.DatabaseInitializationMode",
5454
"deprecation": {
5555
"level": "error",
5656
"replacement": "spring.sql.init.mode",

module/spring-boot-mail/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{
1111
"name": "spring.mail.test-connection",
1212
"description": "Whether to test that the mail server is available on startup.",
13-
"sourceType": "org.springframework.boot.autoconfigure.mail.MailProperties",
13+
"sourceType": "org.springframework.boot.mail.autoconfigure.MailSenderValidatorAutoConfiguration",
1414
"type": "java.lang.Boolean",
1515
"defaultValue": false
1616
}

module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,7 @@
13931393
},
13941394
{
13951395
"name": "management.metrics.export.prometheus.pushgateway.shutdown-operation",
1396-
"type": "org.springframework.boot.actuate.metrics.export.prometheus.PrometheusPushGatewayManager$ShutdownOperation",
1396+
"type": "org.springframework.boot.micrometer.metrics.export.prometheus.PrometheusPushGatewayManager$ShutdownOperation",
13971397
"deprecation": {
13981398
"level": "error",
13991399
"replacement": "management.prometheus.metrics.export.pushgateway.shutdown-operation",

module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
{
1717
"name": "management.otlp.logging.compression",
18-
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties$Compression",
18+
"type": "org.springframework.boot.opentelemetry.autoconfigure.logging.otlp.OtlpLoggingProperties$Compression",
1919
"description": "Method used to compress the payload.",
2020
"defaultValue": "none",
2121
"deprecation": {

0 commit comments

Comments
 (0)