Merge branch '6.2.x'

sbrannen · sbrannen · commit 99d5e90b5e7d · 2025-03-01T13:39:14.000+01:00
diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java
@@ -87,7 +87,7 @@ public class MockitoResetTestExecutionListener extends AbstractTestExecutionList
 	 */
 	@Override
 	public int getOrder() {
-		return Ordered.LOWEST_PRECEDENCE - 100;
+		return ORDER;
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public class MockitoResetTestExecutionListener extends AbstractTestExecutionList`
`87`	`87`	`*/`
`88`	`88`	`@Override`
`89`	`89`	`public int getOrder() {`
`90`		`- return Ordered.LOWEST_PRECEDENCE - 100;`
	`90`	`+ return ORDER;`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Override`