root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

This commit is contained in:
Brian Clozel 2025-03-13 15:26:47 +01:00
parent 90e32cadeb 0f83c483bb
commit 4724020174
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework-docs/modules/ROOT/pages/testing/unit.adoc
View File

@ -47,8 +47,7 @@ out-of-container tests for code that depends on environment-specific properties.
The `org.springframework.mock.web` package contains a comprehensive set of Servlet API The `org.springframework.mock.web` package contains a comprehensive set of Servlet API
mock objects that are useful for testing web contexts, controllers, and filters. These mock objects that are useful for testing web contexts, controllers, and filters. These
mock objects are targeted at usage with Spring's Web MVC framework and are generally more mock objects are targeted at usage with Spring's Web MVC framework and are generally more
convenient to use than dynamic mock objects (such as https://easymock.org/[EasyMock]) convenient to use than dynamic mock objects (such as https://easymock.org/[EasyMock]).
or alternative Servlet API mock objects (such as http://www.mockobjects.com[MockObjects]).
TIP: Since Spring Framework 6.0, the mock objects in `org.springframework.mock.web` are TIP: Since Spring Framework 6.0, the mock objects in `org.springframework.mock.web` are
based on the Servlet 6.0 API. based on the Servlet 6.0 API.

1
src/nohttp/allowlist.lines
View File

@ -2,6 +2,5 @@
^http://jibx.sourceforge.net.* ^http://jibx.sourceforge.net.*
^http://mx4j.sourceforge.net.* ^http://mx4j.sourceforge.net.*
^http://objenesis.org.* ^http://objenesis.org.*
^http://www.mockobjects.com.*
^http://www.w3.org/2000/xmlns/ ^http://www.w3.org/2000/xmlns/
^http://xunitpatterns.com.* ^http://xunitpatterns.com.*