mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.5.x' into 2.6.x
Closes gh-29077
This commit is contained in:
commit
6e01c3edbe
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
|
<web-app version="3.1" xmlns="http://java.sun.com/xml/ns/javaee"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
|
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
|
||||||
|
|
||||||
@ -22,7 +22,7 @@
|
|||||||
<url-pattern>/</url-pattern>
|
<url-pattern>/</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
<!-- Disables Servlet Container welcome file handling. Needed for compatibility
|
<!-- Disables Servlet Container welcome file handling. Needed for compatibility
|
||||||
with Servlet 3.0 and Tomcat 7.0 -->
|
with Servlet 3.0 and Tomcat 7.0 -->
|
||||||
<welcome-file-list>
|
<welcome-file-list>
|
||||||
<welcome-file></welcome-file>
|
<welcome-file></welcome-file>
|
||||||
|
Loading…
Reference in New Issue
Block a user