Merge branch '3.3.x' into 3.4.x

philwebb · philwebb · commit 0f0aa854f7b2 · 2025-05-20T12:59:22.000-07:00
Closes gh-45627
diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -301,7 +301,7 @@
     {
       "name": "spring.application.group",
       "type": "java.lang.String",
-      "description": "Application group."
+      "description": "Application group. Typically used with logging to help identify the application."
     },
     {
       "name": "spring.application.index",
@@ -316,7 +316,7 @@
       "name": "spring.application.name",
       "type": "java.lang.String",
       "sourceType": "org.springframework.boot.context.ContextIdApplicationContextInitializer",
-      "description": "Application name."
+      "description": "Application name. Typically used with logging to help identify the application."
     },
     {
       "name": "spring.application.version",

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@`
`301`	`301`	`{`
`302`	`302`	`"name": "spring.application.group",`
`303`	`303`	`"type": "java.lang.String",`
`304`		`- "description": "Application group."`
	`304`	`+ "description": "Application group. Typically used with logging to help identify the application."`
`305`	`305`	`},`
`306`	`306`	`{`
`307`	`307`	`"name": "spring.application.index",`
`@@ -316,7 +316,7 @@`
`316`	`316`	`"name": "spring.application.name",`
`317`	`317`	`"type": "java.lang.String",`
`318`	`318`	`"sourceType": "org.springframework.boot.context.ContextIdApplicationContextInitializer",`
`319`		`- "description": "Application name."`
	`319`	`+ "description": "Application name. Typically used with logging to help identify the application."`
`320`	`320`	`},`
`321`	`321`	`{`
`322`	`322`	`"name": "spring.application.version",`