Merge pull request #46878 from izeye

snicoll · snicoll · commit c92052987a03 · 2025-08-18T18:13:41.000+02:00
* pr/46878: Polish Closes gh-46878
diff --git a/module/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -254,191 +254,191 @@
       "type": "java.lang.String",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.api-token-type",
       "type": "org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties$TokenType",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.application.cluster-name",
       "type": "java.lang.String",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.application.custom-tags",
       "type": "java.util.Map<java.lang.String,java.lang.String>",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.application.name",
       "type": "java.lang.String",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.application.service-name",
       "type": "java.lang.String",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.application.shard-name",
       "type": "java.lang.String",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.metrics.export.batch-size",
       "type": "java.lang.Integer",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.metrics.export.connect-timeout",
       "type": "java.time.Duration",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.metrics.export.enabled",
       "type": "java.lang.Boolean",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.metrics.export.global-prefix",
       "type": "java.lang.String",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.metrics.export.read-timeout",
       "type": "java.time.Duration",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.metrics.export.report-day-distribution",
       "type": "java.lang.Boolean",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.metrics.export.report-hour-distribution",
       "type": "java.lang.Boolean",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.metrics.export.report-minute-distribution",
       "type": "java.lang.Boolean",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.metrics.export.step",
       "type": "java.time.Duration",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.sender.batch-size",
       "type": "java.lang.Integer",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.sender.flush-interval",
       "type": "java.time.Duration",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.sender.max-queue-size",
       "type": "java.lang.Integer",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.sender.message-size",
       "type": "org.springframework.util.unit.DataSize",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.source",
       "type": "java.lang.String",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.trace-derived-custom-tag-keys",
       "type": "java.util.Set<java.lang.String>",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.tracing.export.enabled",
       "type": "java.lang.Boolean",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     },
     {
       "name": "management.wavefront.uri",
       "type": "java.net.URI",
       "deprecation": {
         "level": "error",
-        "reason": "Wavefront is end-of-live."
+        "reason": "Wavefront is end-of-life."
       }
     }
   ],
diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/service/ConditionalOnMissingHttpServiceProxyBean.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/service/ConditionalOnMissingHttpServiceProxyBean.java
@@ -28,7 +28,7 @@
  * {@link Conditional @Conditional} that matches when one or more HTTP Service bean has
  * been registered.
  *
- * @author Phillip Webb@
+ * @author Phillip Webb
  * @since 4.0.0
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })

Original file line number	Diff line number	Diff line change
`@@ -254,191 +254,191 @@`
`254`	`254`	`"type": "java.lang.String",`
`255`	`255`	`"deprecation": {`
`256`	`256`	`"level": "error",`
`257`		`- "reason": "Wavefront is end-of-live."`
	`257`	`+ "reason": "Wavefront is end-of-life."`
`258`	`258`	`}`
`259`	`259`	`},`
`260`	`260`	`{`
`261`	`261`	`"name": "management.wavefront.api-token-type",`
`262`	`262`	`"type": "org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties$TokenType",`
`263`	`263`	`"deprecation": {`
`264`	`264`	`"level": "error",`
`265`		`- "reason": "Wavefront is end-of-live."`
	`265`	`+ "reason": "Wavefront is end-of-life."`
`266`	`266`	`}`
`267`	`267`	`},`
`268`	`268`	`{`
`269`	`269`	`"name": "management.wavefront.application.cluster-name",`
`270`	`270`	`"type": "java.lang.String",`
`271`	`271`	`"deprecation": {`
`272`	`272`	`"level": "error",`
`273`		`- "reason": "Wavefront is end-of-live."`
	`273`	`+ "reason": "Wavefront is end-of-life."`
`274`	`274`	`}`
`275`	`275`	`},`
`276`	`276`	`{`
`277`	`277`	`"name": "management.wavefront.application.custom-tags",`
`278`	`278`	`"type": "java.util.Map<java.lang.String,java.lang.String>",`
`279`	`279`	`"deprecation": {`
`280`	`280`	`"level": "error",`
`281`		`- "reason": "Wavefront is end-of-live."`
	`281`	`+ "reason": "Wavefront is end-of-life."`
`282`	`282`	`}`
`283`	`283`	`},`
`284`	`284`	`{`
`285`	`285`	`"name": "management.wavefront.application.name",`
`286`	`286`	`"type": "java.lang.String",`
`287`	`287`	`"deprecation": {`
`288`	`288`	`"level": "error",`
`289`		`- "reason": "Wavefront is end-of-live."`
	`289`	`+ "reason": "Wavefront is end-of-life."`
`290`	`290`	`}`
`291`	`291`	`},`
`292`	`292`	`{`
`293`	`293`	`"name": "management.wavefront.application.service-name",`
`294`	`294`	`"type": "java.lang.String",`
`295`	`295`	`"deprecation": {`
`296`	`296`	`"level": "error",`
`297`		`- "reason": "Wavefront is end-of-live."`
	`297`	`+ "reason": "Wavefront is end-of-life."`
`298`	`298`	`}`
`299`	`299`	`},`
`300`	`300`	`{`
`301`	`301`	`"name": "management.wavefront.application.shard-name",`
`302`	`302`	`"type": "java.lang.String",`
`303`	`303`	`"deprecation": {`
`304`	`304`	`"level": "error",`
`305`		`- "reason": "Wavefront is end-of-live."`
	`305`	`+ "reason": "Wavefront is end-of-life."`
`306`	`306`	`}`
`307`	`307`	`},`
`308`	`308`	`{`
`309`	`309`	`"name": "management.wavefront.metrics.export.batch-size",`
`310`	`310`	`"type": "java.lang.Integer",`
`311`	`311`	`"deprecation": {`
`312`	`312`	`"level": "error",`
`313`		`- "reason": "Wavefront is end-of-live."`
	`313`	`+ "reason": "Wavefront is end-of-life."`
`314`	`314`	`}`
`315`	`315`	`},`
`316`	`316`	`{`
`317`	`317`	`"name": "management.wavefront.metrics.export.connect-timeout",`
`318`	`318`	`"type": "java.time.Duration",`
`319`	`319`	`"deprecation": {`
`320`	`320`	`"level": "error",`
`321`		`- "reason": "Wavefront is end-of-live."`
	`321`	`+ "reason": "Wavefront is end-of-life."`
`322`	`322`	`}`
`323`	`323`	`},`
`324`	`324`	`{`
`325`	`325`	`"name": "management.wavefront.metrics.export.enabled",`
`326`	`326`	`"type": "java.lang.Boolean",`
`327`	`327`	`"deprecation": {`
`328`	`328`	`"level": "error",`
`329`		`- "reason": "Wavefront is end-of-live."`
	`329`	`+ "reason": "Wavefront is end-of-life."`
`330`	`330`	`}`
`331`	`331`	`},`
`332`	`332`	`{`
`333`	`333`	`"name": "management.wavefront.metrics.export.global-prefix",`
`334`	`334`	`"type": "java.lang.String",`
`335`	`335`	`"deprecation": {`
`336`	`336`	`"level": "error",`
`337`		`- "reason": "Wavefront is end-of-live."`
	`337`	`+ "reason": "Wavefront is end-of-life."`
`338`	`338`	`}`
`339`	`339`	`},`
`340`	`340`	`{`
`341`	`341`	`"name": "management.wavefront.metrics.export.read-timeout",`
`342`	`342`	`"type": "java.time.Duration",`
`343`	`343`	`"deprecation": {`
`344`	`344`	`"level": "error",`
`345`		`- "reason": "Wavefront is end-of-live."`
	`345`	`+ "reason": "Wavefront is end-of-life."`
`346`	`346`	`}`
`347`	`347`	`},`
`348`	`348`	`{`
`349`	`349`	`"name": "management.wavefront.metrics.export.report-day-distribution",`
`350`	`350`	`"type": "java.lang.Boolean",`
`351`	`351`	`"deprecation": {`
`352`	`352`	`"level": "error",`
`353`		`- "reason": "Wavefront is end-of-live."`
	`353`	`+ "reason": "Wavefront is end-of-life."`
`354`	`354`	`}`
`355`	`355`	`},`
`356`	`356`	`{`
`357`	`357`	`"name": "management.wavefront.metrics.export.report-hour-distribution",`
`358`	`358`	`"type": "java.lang.Boolean",`
`359`	`359`	`"deprecation": {`
`360`	`360`	`"level": "error",`
`361`		`- "reason": "Wavefront is end-of-live."`
	`361`	`+ "reason": "Wavefront is end-of-life."`
`362`	`362`	`}`
`363`	`363`	`},`
`364`	`364`	`{`
`365`	`365`	`"name": "management.wavefront.metrics.export.report-minute-distribution",`
`366`	`366`	`"type": "java.lang.Boolean",`
`367`	`367`	`"deprecation": {`
`368`	`368`	`"level": "error",`
`369`		`- "reason": "Wavefront is end-of-live."`
	`369`	`+ "reason": "Wavefront is end-of-life."`
`370`	`370`	`}`
`371`	`371`	`},`
`372`	`372`	`{`
`373`	`373`	`"name": "management.wavefront.metrics.export.step",`
`374`	`374`	`"type": "java.time.Duration",`
`375`	`375`	`"deprecation": {`
`376`	`376`	`"level": "error",`
`377`		`- "reason": "Wavefront is end-of-live."`
	`377`	`+ "reason": "Wavefront is end-of-life."`
`378`	`378`	`}`
`379`	`379`	`},`
`380`	`380`	`{`
`381`	`381`	`"name": "management.wavefront.sender.batch-size",`
`382`	`382`	`"type": "java.lang.Integer",`
`383`	`383`	`"deprecation": {`
`384`	`384`	`"level": "error",`
`385`		`- "reason": "Wavefront is end-of-live."`
	`385`	`+ "reason": "Wavefront is end-of-life."`
`386`	`386`	`}`
`387`	`387`	`},`
`388`	`388`	`{`
`389`	`389`	`"name": "management.wavefront.sender.flush-interval",`
`390`	`390`	`"type": "java.time.Duration",`
`391`	`391`	`"deprecation": {`
`392`	`392`	`"level": "error",`
`393`		`- "reason": "Wavefront is end-of-live."`
	`393`	`+ "reason": "Wavefront is end-of-life."`
`394`	`394`	`}`
`395`	`395`	`},`
`396`	`396`	`{`
`397`	`397`	`"name": "management.wavefront.sender.max-queue-size",`
`398`	`398`	`"type": "java.lang.Integer",`
`399`	`399`	`"deprecation": {`
`400`	`400`	`"level": "error",`
`401`		`- "reason": "Wavefront is end-of-live."`
	`401`	`+ "reason": "Wavefront is end-of-life."`
`402`	`402`	`}`
`403`	`403`	`},`
`404`	`404`	`{`
`405`	`405`	`"name": "management.wavefront.sender.message-size",`
`406`	`406`	`"type": "org.springframework.util.unit.DataSize",`
`407`	`407`	`"deprecation": {`
`408`	`408`	`"level": "error",`
`409`		`- "reason": "Wavefront is end-of-live."`
	`409`	`+ "reason": "Wavefront is end-of-life."`
`410`	`410`	`}`
`411`	`411`	`},`
`412`	`412`	`{`
`413`	`413`	`"name": "management.wavefront.source",`
`414`	`414`	`"type": "java.lang.String",`
`415`	`415`	`"deprecation": {`
`416`	`416`	`"level": "error",`
`417`		`- "reason": "Wavefront is end-of-live."`
	`417`	`+ "reason": "Wavefront is end-of-life."`
`418`	`418`	`}`
`419`	`419`	`},`
`420`	`420`	`{`
`421`	`421`	`"name": "management.wavefront.trace-derived-custom-tag-keys",`
`422`	`422`	`"type": "java.util.Set<java.lang.String>",`
`423`	`423`	`"deprecation": {`
`424`	`424`	`"level": "error",`
`425`		`- "reason": "Wavefront is end-of-live."`
	`425`	`+ "reason": "Wavefront is end-of-life."`
`426`	`426`	`}`
`427`	`427`	`},`
`428`	`428`	`{`
`429`	`429`	`"name": "management.wavefront.tracing.export.enabled",`
`430`	`430`	`"type": "java.lang.Boolean",`
`431`	`431`	`"deprecation": {`
`432`	`432`	`"level": "error",`
`433`		`- "reason": "Wavefront is end-of-live."`
	`433`	`+ "reason": "Wavefront is end-of-life."`
`434`	`434`	`}`
`435`	`435`	`},`
`436`	`436`	`{`
`437`	`437`	`"name": "management.wavefront.uri",`
`438`	`438`	`"type": "java.net.URI",`
`439`	`439`	`"deprecation": {`
`440`	`440`	`"level": "error",`
`441`		`- "reason": "Wavefront is end-of-live."`
	`441`	`+ "reason": "Wavefront is end-of-life."`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`	`],`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`* {@link Conditional @Conditional} that matches when one or more HTTP Service bean has`
`29`	`29`	`* been registered.`
`30`	`30`	`*`
`31`		`- * @author Phillip Webb@`
	`31`	`+ * @author Phillip Webb`
`32`	`32`	`* @since 4.0.0`
`33`	`33`	`*/`
`34`	`34`	`@Target({ ElementType.TYPE, ElementType.METHOD })`