Merge branch '2.1.x'

Closes gh-17308

spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="https://schemas.xmlsoap.org/wsdl/"
+<wsdl:definitions
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
 	xmlns:tns="https://www.springframework.org/spring-ws/wsdl"
-	xmlns:wsdlsoap="https://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
+	targetNamespace="https://www.springframework.org/spring-ws/wsdl">
 	<wsdl:types>
-		<xsd:schema xmlns:xsd="https://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
+		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			elementFormDefault="qualified"
+			targetNamespace="https://www.springframework.org/spring-ws/wsdl">
 			<xsd:element name="request" type="xsd:string" />
 			<xsd:element name="response" type="xsd:string" />
 		</xsd:schema>
@@ -18,25 +21,26 @@
 	<wsdl:portType name="portType">
 		<wsdl:operation name="operation">
 			<wsdl:input message="tns:requestMessage" name="request" />
-			<wsdl:output message="tns:responseMessage" name="response" />
+			<wsdl:output message="tns:responseMessage"
+				name="response" />
 		</wsdl:operation>
 	</wsdl:portType>
 	<wsdl:binding name="binding" type="tns:portType">
-		<wsdlsoap:binding style="document"
-			transport="https://schemas.xmlsoap.org/soap/http/" />
+		<soap:binding style="document"
+			transport="http://schemas.xmlsoap.org/soap/http" />
 		<wsdl:operation name="operation">
-			<wsdlsoap:operation soapAction="" />
+			<soap:operation soapAction="" />
 			<wsdl:input name="request">
-				<wsdlsoap:body use="literal" />
+				<soap:body use="literal" />
 			</wsdl:input>
 			<wsdl:output name="response">
-				<wsdlsoap:body use="literal" />
+				<soap:body use="literal" />
 			</wsdl:output>
 		</wsdl:operation>
 	</wsdl:binding>
 	<wsdl:service name="service">
 		<wsdl:port binding="tns:binding" name="port">
-			<wsdlsoap:address location="/services" />
+			<soap:address location="/services" />
 		</wsdl:port>
 	</wsdl:service>
 </wsdl:definitions>

src/checkstyle/nohttp-whitelist.txt

@@ -6,3 +6,4 @@
 ^http://www.jdotsoft.com.*
 ^http://spockframework.org.*
 ^http://ganglia.sourceforge.net.*
+^http://schemas.xmlsoap.org.*