Merge branch '6.0.x'

# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
This commit is contained in:
Juergen Hoeller
2023-09-13 17:28:54 +02:00
5 changed files with 100 additions and 58 deletions

View File

@@ -554,7 +554,7 @@ public class ScheduledAnnotationBeanPostProcessor
}
catch (Exception ex) {
throw new IllegalArgumentException(
"Unsupported unit " + timeUnit + " for value \"" + value + "\": " + ex.getMessage(), ex);
"Unsupported unit " + timeUnit + " for value \"" + value + "\": " + ex.getMessage());
}
}