Merge branch '2.4.x' into 2.5.x

Closes gh-29076
pull/29161/head
Phillip Webb 3 years ago
commit 17363d1b3a

@ -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">

Loading…
Cancel
Save