Merge branch '4.1.x' into 4.2.x

ryanjbaxter · ryanjbaxter · commit 2298cdba5095 · 2025-01-21T15:35:34.000-05:00
diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java
@@ -119,7 +119,7 @@ public ConfigDataContextRefresher configDataContextRefresher(ConfigurableApplica
 		return new ConfigDataContextRefresher(context, scope, properties);
 	}
 
-	@ConditionalOnProperty(value = "spring.cloud.refresh.on-restart.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(value = REFRESH_SCOPE_PREFIX + ".on-restart.enabled", matchIfMissing = true)
 	@Bean
 	RefreshScopeLifecycle refreshScopeLifecycle(ContextRefresher contextRefresher) {
 		return new RefreshScopeLifecycle(contextRefresher);

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public ConfigDataContextRefresher configDataContextRefresher(ConfigurableApplica`
`119`	`119`	`return new ConfigDataContextRefresher(context, scope, properties);`
`120`	`120`	`}`
`121`	`121`
`122`		`- @ConditionalOnProperty(value = "spring.cloud.refresh.on-restart.enabled", matchIfMissing = true)`
	`122`	`+ @ConditionalOnProperty(value = REFRESH_SCOPE_PREFIX + ".on-restart.enabled", matchIfMissing = true)`
`123`	`123`	`@Bean`
`124`	`124`	`RefreshScopeLifecycle refreshScopeLifecycle(ContextRefresher contextRefresher) {`
`125`	`125`	`return new RefreshScopeLifecycle(contextRefresher);`