Merge branch '2.1.x'

Closes gh-17308
2019-06-25 11:19:57 -07:00
parent 76e1fb4a1e 02e705c8e4
commit 0b720b99b2
2 changed files with 16 additions and 11 deletions
--- a/src/checkstyle/nohttp-whitelist.txt
+++ b/src/checkstyle/nohttp-whitelist.txt
@@ -6,3 +6,4 @@
 ^http://www.jdotsoft.com.*
 ^http://spockframework.org.*
 ^http://ganglia.sourceforge.net.*
+^http://schemas.xmlsoap.org.*