Merge branch '2.7.x'

Closes gh-29079
This commit is contained in:
Phillip Webb 2021-12-15 22:19:36 -08:00
commit c0023118a9

View File

@ -1,5 +1,5 @@
<?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"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">