Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java
#	spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
#	spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
This commit is contained in:
Juergen Hoeller
2022-04-08 14:42:12 +02:00
parent 98eeff6817 35de7e19ee
commit 9ae35e78b1
4 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-context/src/test/resources/org/springframework/jmx/export/notificationPublisherTests.xml
View File

@@ -17,7 +17,7 @@
<entry key="spring:type=PublisherStandardMBean" value-ref="publisherStandardMBean"/>
</map>
</property>
<property name="server" ref="server"/>
<property name="server" ref="server"/>
</bean>
</beans>