spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.4.x' into 3.5.x

Browse Source 
Closes gh-48227
This commit is contained in:
Andy Wilkinson
2025-11-21 16:46:26 +00:00
parent d4408ab9cd fc8f9a322d
commit 7459fe0163
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/MyAutoConfiguration.kt
+2 -2
View File
@@ -16,11 +16,11 @@
package org.springframework.boot.docs.features.developingautoconfiguration.conditionannotations.beanconditions
import org.springframework.boot.autoconfigure.AutoConfiguration
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
@Configuration(proxyBeanMethods = false)
@AutoConfiguration
class MyAutoConfiguration {
@Bean
spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/MyAutoConfiguration.kt
+2 -1
View File
@@ -16,12 +16,13 @@
package org.springframework.boot.docs.features.developingautoconfiguration.conditionannotations.classconditions
import org.springframework.boot.autoconfigure.AutoConfiguration
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
@Configuration(proxyBeanMethods = false)
@AutoConfiguration
// Some conditions ...
class MyAutoConfiguration {