mirror of
https://github.com/spring-projects/spring-framework
synced 2026-06-08 17:33:33 +00:00
7f4e09e994
# Conflicts: # spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java # spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextTests.java # spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java # spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java # spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java # spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java # spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java # spring-context/src/test/java/org/springframework/scripting/support/StandardScriptFactoryTests.java # spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java # spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutorTests.java