diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests-context.xml
index 42804f08de..93bbcc77c5 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests-context.xml
@@ -4,10 +4,10 @@
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:int-amqp="http://www.springframework.org/schema/integration/amqp"
xmlns:rabbit="http://www.springframework.org/schema/rabbit"
- xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/rabbit https://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests-context.xml
index a212d7c372..d0d472e041 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml
index ca3b3c4294..e05f83d402 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml
@@ -6,12 +6,12 @@
xmlns:rabbit="http://www.springframework.org/schema/rabbit"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/rabbit https://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-headerMapper-fail-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-headerMapper-fail-context.xml
index f93bb71482..86f075d269 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-headerMapper-fail-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-headerMapper-fail-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-context.xml
index 7a665877e3..0ae86a0dc2 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si-amqp="http://www.springframework.org/schema/integration/amqp"
xmlns:int="http://www.springframework.org/schema/integration"
- xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-headerMapper-fail-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-headerMapper-fail-context.xml
index 0ef15ed537..04eb20c77f 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-headerMapper-fail-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests-headerMapper-fail-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:amqp="http://www.springframework.org/schema/integration/amqp"
xmlns:int="http://www.springframework.org/schema/integration"
- xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests-context.xml
index a56f93191e..f065ecb2f3 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests-context.xml
@@ -4,10 +4,10 @@
xmlns:amqp="http://www.springframework.org/schema/integration/amqp"
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:rabbit="http://www.springframework.org/schema/rabbit"
- xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/rabbit https://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests-headerMapper-fail-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests-headerMapper-fail-context.xml
index 3b263d34a8..def0f5f93b 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests-headerMapper-fail-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests-headerMapper-fail-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterWithinChainParserTests-fail-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterWithinChainParserTests-fail-context.xml
index f6c0bc9200..944ae97f73 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterWithinChainParserTests-fail-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterWithinChainParserTests-fail-context.xml
@@ -4,10 +4,10 @@
xmlns:amqp="http://www.springframework.org/schema/integration/amqp"
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:rabbit="http://www.springframework.org/schema/rabbit"
- xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/rabbit https://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml
index 6885607938..fc3d85b2e1 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml
@@ -4,10 +4,10 @@
xmlns:amqp="http://www.springframework.org/schema/integration/amqp"
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:rabbit="http://www.springframework.org/schema/rabbit"
- xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/rabbit https://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/rabbit https://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayIntegrationTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayIntegrationTests-context.xml
index d45044815f..0a9c88a81c 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayIntegrationTests-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayIntegrationTests-context.xml
@@ -4,11 +4,11 @@
xmlns:amqp="http://www.springframework.org/schema/integration/amqp"
xmlns:console="http://www.springframework.org/schema/integration/stream"
xmlns:rabbit="http://www.springframework.org/schema/rabbit"
- xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
- http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/integration/stream https://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
+ http://www.springframework.org/schema/rabbit https://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests-context.xml
index 8069985f1a..a49f481d1e 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests-context.xml
@@ -4,11 +4,11 @@
xmlns:amqp="http://www.springframework.org/schema/integration/amqp"
xmlns:console="http://www.springframework.org/schema/integration/stream"
xmlns:rabbit="http://www.springframework.org/schema/rabbit"
- xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
- http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/integration/stream https://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
+ http://www.springframework.org/schema/rabbit https://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp https://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/rabbit https://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/expression-evaluating-correlation-with-bf.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/expression-evaluating-correlation-with-bf.xml
index 992fcb56c2..33b9d6487d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/expression-evaluating-correlation-with-bf.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/expression-evaluating-correlation-with-bf.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests-context.xml
index d39acdbde5..a33c587aa3 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:task="http://www.springframework.org/schema/task"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests-context.xml
index d760b273cd..3d91846303 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:task="http://www.springframework.org/schema/task"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests-context.xml
index 1a9847b8ce..ce372bcc5f 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests-context.xml
@@ -3,9 +3,9 @@
xmlns="http://www.springframework.org/schema/integration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
index 59effe5d62..c76f1630d9 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:task="http://www.springframework.org/schema/task"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests-context.xml
index 9e05bdca92..11b36ff879 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests-context.xml
@@ -3,9 +3,9 @@
xmlns="http://www.springframework.org/schema/integration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests-context.xml
index 4b5482f7b2..39dd7e3afc 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests-context.xml
index 4190babf86..5f5092ed21 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests-context.xml
index a8bce6bdf1..3e684512a6 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests-context.xml
index 2c8b90197c..bfb1e1b257 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests-context.xml
@@ -3,9 +3,9 @@
xmlns="http://www.springframework.org/schema/integration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml
index 0c4fc562b9..1d411a29bb 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml
index 4147e6b05e..61b3a0c3a1 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml
@@ -1,8 +1,8 @@
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml
index 587fc5e513..0cac76e5a1 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests-context.xml
index 53e46f5f35..5af12fa3c1 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTests-context.xml
index f5f39d26da..b1f8262fc2 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsConverter-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsConverter-fail-context.xml
index 3eda380334..5dfcfd024b 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsConverter-fail-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsConverter-fail-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsDatatype-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsDatatype-fail-context.xml
index 09f870d2b9..aac732689a 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsDatatype-fail-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsDatatype-fail-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsDispatcher-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsDispatcher-fail-context.xml
index bd00f3216e..ee49c0b755 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsDispatcher-fail-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsDispatcher-fail-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsInterceptors-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsInterceptors-fail-context.xml
index bea5313997..0217c73916 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsInterceptors-fail-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsInterceptors-fail-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsNoSubs-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsNoSubs-fail-context.xml
index f17db81a87..b9cd193b20 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsNoSubs-fail-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsNoSubs-fail-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsQueue-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsQueue-fail-context.xml
index 9cf1428eec..be938fe429 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsQueue-fail-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsQueue-fail-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsTwoSubs-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsTwoSubs-fail-context.xml
index e6d585f0ef..d4e10bf56f 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsTwoSubs-fail-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsTwoSubs-fail-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsTwoSubsAfter-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsTwoSubsAfter-fail-context.xml
index 6c1d686ec1..67ff5e3455 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsTwoSubsAfter-fail-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTestsTwoSubsAfter-fail-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml
index 9132bf7b91..4c1c07a8f4 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml
@@ -4,10 +4,10 @@
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests-context.xml
index 481ddf0580..50170178f9 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/channel-override-config.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/channel-override-config.xml
index 1f0e1c8d6e..7b7fd1c921 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/channel-override-config.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/channel-override-config.xml
@@ -4,10 +4,10 @@
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/AutoGeneratedChannelTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/AutoGeneratedChannelTests-context.xml
index 6d0def4d9e..6790d5e661 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/AutoGeneratedChannelTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/AutoGeneratedChannelTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests-context.xml
index 3071b34203..aeb51c9350 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests-no-converter-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests-no-converter-context.xml
index 1f2dee5540..97ee55e883 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests-no-converter-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests-no-converter-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml
index ef2c1cdd22..a4e2586372 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithLoadBalancerRef-fail-config.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithLoadBalancerRef-fail-config.xml
index b3c25540f3..9c7437b072 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithLoadBalancerRef-fail-config.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithLoadBalancerRef-fail-config.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests-context.xml
index f1c6b8240e..575dfbef6f 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests-context.xml
index 6a59fb5df1..e25ec6fe1f 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests-context.xml
@@ -1,9 +1,9 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml
index 077975d0eb..b35315a0b2 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelParserGlobalConverterTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelParserGlobalConverterTests.xml
index 07f2fb248b..dc63bcee2f 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelParserGlobalConverterTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelParserGlobalConverterTests.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml
index c04607fd46..97e6dd00e9 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:integration="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
index 9952f4c162..de1dd97bfe 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
index c2c31f3bba..e311d162fa 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml
index b32bfb1b30..6cd09a17f1 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests-context.xml
index a34fff74f5..db1101a6fb 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests-context.xml
@@ -1,8 +1,8 @@
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests-context.xml
index efebd974b3..d8919df2b9 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests-context.xml
index d6e5383c4f..7acb9d40b9 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests-context.xml
@@ -5,10 +5,10 @@
xmlns:p="http://www.springframework.org/schema/p"
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:util="http://www.springframework.org/schema/util"
xmlns:beans="http://www.springframework.org/schema/c"
- xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
true
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests-context.xml
index 6632501d07..0f98e08e40 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ImplicitConsumerChannelTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ImplicitConsumerChannelTests-context.xml
index b97b53bb18..92ce693c9d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ImplicitConsumerChannelTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ImplicitConsumerChannelTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/parent-config.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/parent-config.xml
index dd3b9a2298..bf6dbd8dee 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/parent-config.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/parent-config.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests-context.xml
index 234d7a5215..bc08873cc9 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests-context.xml
index 8b28fedd5c..9d472ccb30 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests-context.xml
@@ -5,11 +5,11 @@
xmlns:task="http://www.springframework.org/schema/task"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests-context.xml
index f1f93257ad..7513917a3f 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests-context.xml
index c80a20a8ad..d1083dcd6f 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserSmartLifecycleAttributesTest.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserSmartLifecycleAttributesTest.xml
index 840750c1ca..6e56db8778 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserSmartLifecycleAttributesTest.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserSmartLifecycleAttributesTest.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
index 7a275d23a7..d6f89a6250 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-inner-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-inner-context.xml
index d3d8d8dedc..d6e6b12a17 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-inner-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-inner-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests-context.xml
index 0d41613d60..7e59b7f3c0 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml
index d1891a24f9..21f96a17ab 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/InboundChannelAdapterInnerBeanWithExpression-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/InboundChannelAdapterInnerBeanWithExpression-fail-context.xml
index 745a19f9e4..6e58761fcb 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/InboundChannelAdapterInnerBeanWithExpression-fail-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/InboundChannelAdapterInnerBeanWithExpression-fail-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelWithComparatorAndMessageStoreParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelWithComparatorAndMessageStoreParserTests.xml
index 60ebe528c9..d995bdaf77 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelWithComparatorAndMessageStoreParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelWithComparatorAndMessageStoreParserTests.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelWithMessageStoreAndCapacityParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelWithMessageStoreAndCapacityParserTests.xml
index ec5f6e99ae..bfe3f0ef63 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelWithMessageStoreAndCapacityParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelWithMessageStoreAndCapacityParserTests.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithMessageStoreAndCapacityParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithMessageStoreAndCapacityParserTests.xml
index ecfb537ba8..4d712cbbf1 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithMessageStoreAndCapacityParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithMessageStoreAndCapacityParserTests.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithRefAndCapacityParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithRefAndCapacityParserTests.xml
index af1d71566c..3d5826c316 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithRefAndCapacityParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithRefAndCapacityParserTests.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithRefAndMessageStoreParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithRefAndMessageStoreParserTests.xml
index dc44de5880..7afb859967 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithRefAndMessageStoreParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelWithRefAndMessageStoreParserTests.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests-context.xml
index d36f6fb7e0..99eb73f255 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:task="http://www.springframework.org/schema/task"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ReleaseStrategyMethodWithMissingReference.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/ReleaseStrategyMethodWithMissingReference.xml
index 8c5bc79734..e2d7cfd704 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/ReleaseStrategyMethodWithMissingReference.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ReleaseStrategyMethodWithMissingReference.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests-context.xml
index 0273554938..5271d8f8bd 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests-context.xml
index 9b10eb8e90..ef67d208e5 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml
index 7a5f7c28d4..0eabc14f9e 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml
@@ -4,10 +4,10 @@
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests-context.xml
index 6f6d25bbda..7ebc321888 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests-context.xml
index ad12db9248..a7a4208c84 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/aggregatorParserFailTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/aggregatorParserFailTests.xml
index c515cb108c..a88bb3ab01 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/aggregatorParserFailTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/aggregatorParserFailTests.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests-context.xml
index 696740f5bd..dea6717d9e 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests-context.xml
@@ -2,9 +2,9 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
index 0c0bb408d0..e4d1d9ab80 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:integration="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
index 1e9f702254..03c50c7102 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
index 05e8f8fcd1..e49ed4b9ea 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:integration="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml
index ab679273ca..bc5d0251ab 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml
@@ -3,11 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd
+ https://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context.xsd">
+ https://www.springframework.org/schema/context/spring-context.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
index 16f9abd373..8ac6b082e9 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:integration="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/correlationStrategyWithVoidMethods.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/correlationStrategyWithVoidMethods.xml
index ba7efe8c7c..c6a3dd59a8 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/correlationStrategyWithVoidMethods.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/correlationStrategyWithVoidMethods.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
index fd3f42e57b..a5ab53bc5c 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/invalidNestedChainWithOutboundChannelAdapter-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/invalidNestedChainWithOutboundChannelAdapter-context.xml
index 8777987fa3..f7aa873da7 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/invalidNestedChainWithOutboundChannelAdapter-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/invalidNestedChainWithOutboundChannelAdapter-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/invalidReleaseStrategyMethod.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/invalidReleaseStrategyMethod.xml
index b1966afc96..2ff73fd7b2 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/invalidReleaseStrategyMethod.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/invalidReleaseStrategyMethod.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
index 4db2000b82..d0219c2c34 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml
index a942fc52e0..d8a7bad341 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml
index 0088cca99d..c33e3dcc4e 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
index 4db2000b82..d0219c2c34 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/resequencerParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
index 8358916eed..e72b52cd42 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
index bda9c70b43..232388cb9f 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests-context.xml
index a07f48f87e..c100bd14e3 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml
index 0140adcce8..e9811b6fe5 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests-context.xml
index c3c80b96c2..27d0444b2c 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/context/spring-context.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-child.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-child.xml
index eb58bfaf54..3414617990 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-child.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-child.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-parent.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-parent.xml
index 772896960c..039d6743b5 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-parent.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-parent.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests-context.xml
index a23346eeed..c6d38a28e7 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests-context.xml
index 789e81cde1..c662a3c1a1 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusLifecycleTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusLifecycleTests-context.xml
index afe1dbeb64..41bdf7368f 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusLifecycleTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusLifecycleTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests-context.xml
index 906a908db3..f410c5ed7c 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusRecipientListRouterTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusRecipientListRouterTests-context.xml
index cdcbff6ddd..6d25f57e47 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusRecipientListRouterTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusRecipientListRouterTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests-context.xml
index 3cda23442f..1ae5733903 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests-context.xml
@@ -2,9 +2,9 @@
+ https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests-context.xml
index d08176ec70..f0777244fd 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests-context.xml
index 3a868eb80e..728e15892d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests-parent.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests-parent.xml
index 1f3f246d6b..eb58552a54 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests-parent.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests-parent.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml
index f6378ee11e..f433dd6430 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests-context.xml
index aeb8ce9803..0de41c0171 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultOutboundChannelAdapterParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultOutboundChannelAdapterParserTests-context.xml
index 65862c08fb..8d747ec813 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultOutboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultOutboundChannelAdapterParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:task="http://www.springframework.org/schema/task"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests-context.xml
index 83788e4d9c..a6cf20ac4a 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests-context.xml
@@ -5,10 +5,10 @@
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:p="http://www.springframework.org/schema/p"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests-context.xml
index c1cf207ed8..f91966bafd 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests-context.xml
@@ -4,9 +4,9 @@
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:p="http://www.springframework.org/schema/p"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests-context.xml
index 379c6ae806..cca4506525 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersDefaultConfigurationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersDefaultConfigurationTests-context.xml
index 902587d6ad..874cf0df42 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersDefaultConfigurationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersDefaultConfigurationTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:task="http://www.springframework.org/schema/task"
- xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersDontOverrideDefaultTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersDontOverrideDefaultTests-context.xml
index 111a0472c5..bd2f224e07 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersDontOverrideDefaultTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersDontOverrideDefaultTests-context.xml
@@ -1,7 +1,7 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests-context.xml
index 946fa39367..5221b52b5a 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
456
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EndpointRoleParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EndpointRoleParserTests-context.xml
index a9c25c9821..0fbd512768 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EndpointRoleParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EndpointRoleParserTests-context.xml
@@ -4,10 +4,10 @@
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests-context.xml
index 09b275f59b..05269420ad 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests-context.xml
@@ -4,11 +4,11 @@
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd
+ https://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util.xsd">
+ https://www.springframework.org/schema/util/spring-util.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2-context.xml
index de870ff78c..d6cd260bb9 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-context.xml
index f116f2f3b2..24372067f3 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-fail-context.xml
index 83e9002850..f419e79e02 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-fail-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-fail-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4-context.xml
index d21ac1587b..a21f083900 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4-context.xml
@@ -4,11 +4,11 @@
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd
+ https://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util.xsd">
+ https://www.springframework.org/schema/util/spring-util.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5-context.xml
index 72bf561dbb..ca1b211a1a 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel-context.xml
index 1fd7e54d8f..734fbe0c1b 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests-context.xml
index 6c808c411b..daa3ab17fc 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests-context.xml
index c5147695b3..a686098487 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests-context.xml
index 24db47ca9d..f9b54ad130 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests-context.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests-context.xml
index 043d6cf6af..60848592a5 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests-context.xml
index 0ba0aa1e18..cb72dba13b 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests-context.xml
index a57ecdfef2..4b8dd96dc2 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests-context.xml
index 9330f2a066..0388634215 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests-context.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd">
+ https://www.springframework.org/schema/integration/spring-integration.xsd">