Merge branch 'main' into 4.0.x

philwebb · philwebb · commit 2cc7890f0f20 · 2025-05-20T12:59:40.000-07:00
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
@@ -341,7 +341,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",
@@ -356,7 +356,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
`@@ -341,7 +341,7 @@`
`341`	`341`	`{`
`342`	`342`	`"name": "spring.application.group",`
`343`	`343`	`"type": "java.lang.String",`
`344`		`- "description": "Application group."`
	`344`	`+ "description": "Application group. Typically used with logging to help identify the application."`
`345`	`345`	`},`
`346`	`346`	`{`
`347`	`347`	`"name": "spring.application.index",`
`@@ -356,7 +356,7 @@`
`356`	`356`	`"name": "spring.application.name",`
`357`	`357`	`"type": "java.lang.String",`
`358`	`358`	`"sourceType": "org.springframework.boot.context.ContextIdApplicationContextInitializer",`
`359`		`- "description": "Application name."`
	`359`	`+ "description": "Application name. Typically used with logging to help identify the application."`
`360`	`360`	`},`
`361`	`361`	`{`
`362`	`362`	`"name": "spring.application.version",`