Merge branch '3.5.x'

Closes gh-48306

Author: snicoll

cli/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java

@@ -244,7 +244,7 @@ private int handleError(boolean debug, Exception ex) {
 		if (ex instanceof CommandException commandException) {
 			options = commandException.getOptions();
 			if (options.contains(CommandException.Option.RETHROW)) {
-				throw (CommandException) ex;
+				throw commandException;
 			}
 		}
 		boolean couldNotShowMessage = false;

core/spring-boot-test/src/main/java/org/springframework/boot/test/context/AnnotationsPropertySource.java

@@ -138,7 +138,7 @@ private void putProperties(String name, Skip defaultSkip, Object value, Map<Stri
 		}
 		else if (value instanceof MergedAnnotation<?> annotation) {
 			for (Method attribute : annotation.getType().getDeclaredMethods()) {
-				collectProperties(name, defaultSkip, (MergedAnnotation<?>) value, attribute, properties);
+				collectProperties(name, defaultSkip, annotation, attribute, properties);
 			}
 		}
 		else {