Merge branch '3.2.x' into 3.3.x

philwebb · philwebb · commit 26ea4f9fb197 · 2024-06-25T22:16:10.000-07:00
diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderWithScopeIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderWithScopeIntegrationTests.java
@@ -187,7 +187,7 @@ public String getConversationId() {
 			return null;
 		}
 
-		public void destroy() {
+		void destroy() {
 			synchronized (this) {
 				this.destructors.forEach((name, actions) -> actions.forEach(Runnable::run));
 				this.destructors.clear();

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public String getConversationId() {`
`187`	`187`	`return null;`
`188`	`188`	`}`
`189`	`189`
`190`		`- public void destroy() {`
	`190`	`+ void destroy() {`
`191`	`191`	`synchronized (this) {`
`192`	`192`	`this.destructors.forEach((name, actions) -> actions.forEach(Runnable::run));`
`193`	`193`	`this.destructors.clear();`