Merge branch '2.3.x' into 2.4.x

Closes gh-26168
2021-04-20 11:16:23 +01:00
parent 52543b84c1 82198a99e0
commit bc1a462143
7 changed files with 18 additions and 10 deletions
--- a/src/nohttp/whitelist.lines
+++ b/src/nohttp/whitelist.lines
@@ -1,8 +1,9 @@
 ^http://exslt.org/common.*
+^http://ganglia.sourceforge.net.*
 ^http://hsqldb.org.*
 ^http://livereload.com/.*
+^http://logback.qos.ch/manual/loggingSeparation.html
+^http://schemas.xmlsoap.org/.*
 ^http://www.jdotsoft.com.*
-^http://spockframework.org.*
-^http://ganglia.sourceforge.net.*
-^http://schemas.xmlsoap.org.*
 ^http://www.liquibase.org/xml/ns/dbchangelog/.*
+^http://www.w3.org/2000/09/xmldsig.*