diff --git a/build.gradle b/build.gradle
index 65421103a1..dea6820415 100644
--- a/build.gradle
+++ b/build.gradle
@@ -133,7 +133,7 @@ subprojects { subproject ->
 		romeToolsVersion = '1.8.0'
 		servletApiVersion = '4.0.0'
 		smackVersion = '4.2.2'
-		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.2.RELEASE'
+		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.0.BUILD-SNAPSHOT'
 		springDataJpaVersion = '2.1.0.BUILD-SNAPSHOT'
 		springDataMongoVersion = '2.1.0.BUILD-SNAPSHOT'
 		springDataRedisVersion = '2.1.0.BUILD-SNAPSHOT'
@@ -142,7 +142,7 @@ subprojects { subproject ->
 		springSocialTwitterVersion = '1.1.2.RELEASE'
 		springRetryVersion = '1.2.2.RELEASE'
 		springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.4.RELEASE'
-		springWsVersion = '3.0.0.RELEASE'
+		springWsVersion = '3.0.1.RELEASE'
 		tomcatVersion = "8.5.23"
 		xmlUnitVersion = '1.6'
 		xstreamVersion = '1.4.10'
diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java
index e5759eeb68..a46de7fb69 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
 import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
+import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
 import org.springframework.amqp.rabbit.listener.exception.ListenerExecutionFailedException;
 import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.amqp.support.converter.MessageConverter;
diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java
index 629f538c83..b7e33b1804 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +25,9 @@ import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessagePostProcessor;
 import org.springframework.amqp.core.MessageProperties;
-import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
+import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
 import org.springframework.amqp.rabbit.listener.exception.ListenerExecutionFailedException;
 import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.amqp.support.converter.MessageConverter;
diff --git a/spring-integration-amqp/src/main/resources/META-INF/spring.schemas b/spring-integration-amqp/src/main/resources/META-INF/spring.schemas
index f60ef6be4b..ed748d7290 100644
--- a/spring-integration-amqp/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-amqp/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd
-http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd
diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd
similarity index 99%
rename from spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd
rename to spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd
index 3423339107..1b2ce7f920 100644
--- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd
+++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd
@@ -9,7 +9,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
 	<xsd:element name="outbound-channel-adapter">
 		<xsd:annotation>
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java
index c852b2ebcc..67a23f8b40 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,10 +30,10 @@ import org.junit.runner.RunWith;
 import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
-import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
 import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
 import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
+import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
 import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
@@ -51,6 +51,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Mark Fisher
  * @author Artem Bilan
  * @author Gary Russell
+ *
  * @since 2.1
  */
 @ContextConfiguration
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java
index abda7fbe6b..74c68d91cf 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,9 +31,9 @@ import org.mockito.Mockito;
 import org.springframework.amqp.core.Address;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
-import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
+import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.amqp.support.converter.SimpleMessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java
index e09d249a52..4efd3389d6 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,10 +48,10 @@ import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.rabbit.connection.Connection;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
+import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
 import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.amqp.support.converter.MessageConversionException;
@@ -81,6 +81,7 @@ import com.rabbitmq.client.Channel;
 /**
  * @author Artem Bilan
  * @author Gary Russell
+ *
  * @since 3.0
  */
 public class InboundEndpointTests {
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java
index 8633168fcf..98dee457a7 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ import org.springframework.util.StringUtils;
  */
 public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHandler {
 
-	private static final String VERSION = "5.0";
+	private static final String VERSION = "5.1";
 
 	protected final Log logger = LogFactory.getLog(this.getClass());
 
diff --git a/spring-integration-core/src/main/resources/META-INF/spring.schemas b/spring-integration-core/src/main/resources/META-INF/spring.schemas
index e234cb04e3..c102570d9a 100644
--- a/spring-integration-core/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-core/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/spring-integration-5.0.xsd=org/springframework/integration/config/spring-integration-5.0.xsd
-http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/spring-integration-5.0.xsd
+http\://www.springframework.org/schema/integration/spring-integration-5.1.xsd=org/springframework/integration/config/spring-integration-5.1.xsd
+http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/spring-integration-5.1.xsd
diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.1.xsd
similarity index 100%
rename from spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.0.xsd
rename to spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.1.xsd
diff --git a/spring-integration-event/src/main/resources/META-INF/spring.schemas b/spring-integration-event/src/main/resources/META-INF/spring.schemas
index c82ead7a5a..ada3f7ab52 100644
--- a/spring-integration-event/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-event/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/event/spring-integration-event-5.0.xsd=org/springframework/integration/event/config/spring-integration-event-5.0.xsd
-http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-5.0.xsd
+http\://www.springframework.org/schema/integration/event/spring-integration-event-5.1.xsd=org/springframework/integration/event/config/spring-integration-event-5.1.xsd
+http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-5.1.xsd
diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.0.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.1.xsd
similarity index 99%
rename from spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.0.xsd
rename to spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.1.xsd
index e8c2375dfa..ee50ce9886 100644
--- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.0.xsd
+++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.1.xsd
@@ -8,7 +8,7 @@
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-feed/src/main/resources/META-INF/spring.schemas b/spring-integration-feed/src/main/resources/META-INF/spring.schemas
index 7470fd3256..9d3f898206 100644
--- a/spring-integration-feed/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-feed/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/feed/spring-integration-feed-5.0.xsd=org/springframework/integration/feed/config/spring-integration-feed-5.0.xsd
-http\://www.springframework.org/schema/integration/feed/spring-integration-feed.xsd=org/springframework/integration/feed/config/spring-integration-feed-5.0.xsd
+http\://www.springframework.org/schema/integration/feed/spring-integration-feed-5.1.xsd=org/springframework/integration/feed/config/spring-integration-feed-5.1.xsd
+http\://www.springframework.org/schema/integration/feed/spring-integration-feed.xsd=org/springframework/integration/feed/config/spring-integration-feed-5.1.xsd
diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-5.0.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-5.1.xsd
similarity index 99%
rename from spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-5.0.xsd
rename to spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-5.1.xsd
index c701effd2a..bfbb52e1a8 100644
--- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-5.0.xsd
+++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-5.1.xsd
@@ -9,7 +9,7 @@
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:element name="inbound-channel-adapter">
 		<xsd:annotation>
diff --git a/spring-integration-file/src/main/resources/META-INF/spring.schemas b/spring-integration-file/src/main/resources/META-INF/spring.schemas
index bf02e4bdb5..3c149fcc14 100644
--- a/spring-integration-file/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-file/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/file/spring-integration-file-5.0.xsd=org/springframework/integration/file/config/spring-integration-file-5.0.xsd
-http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-5.0.xsd
+http\://www.springframework.org/schema/integration/file/spring-integration-file-5.1.xsd=org/springframework/integration/file/config/spring-integration-file-5.1.xsd
+http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-5.1.xsd
diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.0.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd
similarity index 99%
rename from spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.0.xsd
rename to spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd
index c11f885e21..d6f489639a 100644
--- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.0.xsd
+++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd
@@ -10,7 +10,7 @@
 
     <xsd:import namespace="http://www.springframework.org/schema/beans"/>
     <xsd:import namespace="http://www.springframework.org/schema/integration"
-                schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+                schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
     <xsd:annotation>
         <xsd:documentation><![CDATA[
diff --git a/spring-integration-ftp/src/main/resources/META-INF/spring.schemas b/spring-integration-ftp/src/main/resources/META-INF/spring.schemas
index f76169597c..6ca9613869 100644
--- a/spring-integration-ftp/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-ftp/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-5.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-5.0.xsd
-http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-5.0.xsd
+http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-5.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-5.1.xsd
+http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-5.1.xsd
diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.1.xsd
similarity index 99%
rename from spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.0.xsd
rename to spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.1.xsd
index 3d46efe242..0036d9b269 100644
--- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.0.xsd
+++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.1.xsd
@@ -10,9 +10,9 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration/file"
-		schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-5.1.xsd" />
 
 	<xsd:element name="outbound-channel-adapter">
 		<xsd:annotation>
diff --git a/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas b/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas
index 1694ebee78..0d307e22a5 100644
--- a/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd
-http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd
+http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd
+http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd
diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd
similarity index 99%
rename from spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd
rename to spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd
index a797b3e872..8203f9a326 100644
--- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd
+++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd
@@ -10,7 +10,7 @@
 				schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
 	Defines the core configuration elements for Spring Integration GemFire Support.
diff --git a/spring-integration-groovy/src/main/resources/META-INF/spring.schemas b/spring-integration-groovy/src/main/resources/META-INF/spring.schemas
index c2d4ac6e11..2dc5c39da9 100644
--- a/spring-integration-groovy/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-groovy/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-5.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-5.0.xsd
-http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-5.0.xsd
+http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-5.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-5.1.xsd
+http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-5.1.xsd
diff --git a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.0.xsd b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.1.xsd
similarity index 97%
rename from spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.0.xsd
rename to spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.1.xsd
index 66861bfd4e..ca6e7c7bec 100644
--- a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.0.xsd
+++ b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.1.xsd
@@ -7,11 +7,11 @@
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xsd:include
-		schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.0.xsd"
+		schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.1.xsd"
 		/>
 
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:element name="script" type="GroovyScript">
 		<xsd:annotation>
diff --git a/spring-integration-http/src/main/resources/META-INF/spring.schemas b/spring-integration-http/src/main/resources/META-INF/spring.schemas
index 86bf9752b2..28418d3ac0 100644
--- a/spring-integration-http/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-http/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/http/spring-integration-http-5.0.xsd=org/springframework/integration/http/config/spring-integration-http-5.0.xsd
-http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-5.0.xsd
+http\://www.springframework.org/schema/integration/http/spring-integration-http-5.1.xsd=org/springframework/integration/http/config/spring-integration-http-5.1.xsd
+http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-5.1.xsd
diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.0.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd
similarity index 99%
rename from spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.0.xsd
rename to spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd
index aaf741049c..92078dc4a8 100644
--- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.0.xsd
+++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd
@@ -8,7 +8,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-ip/src/main/resources/META-INF/spring.schemas b/spring-integration-ip/src/main/resources/META-INF/spring.schemas
index e3c7c44392..e0be4e80d2 100644
--- a/spring-integration-ip/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-ip/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/ip/spring-integration-ip-5.0.xsd=org/springframework/integration/ip/config/spring-integration-ip-5.0.xsd
-http\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip-5.0.xsd
+http\://www.springframework.org/schema/integration/ip/spring-integration-ip-5.1.xsd=org/springframework/integration/ip/config/spring-integration-ip-5.1.xsd
+http\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip-5.1.xsd
diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.0.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.1.xsd
similarity index 99%
rename from spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.0.xsd
rename to spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.1.xsd
index 532c028034..b35ae329d7 100644
--- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.0.xsd
+++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.1.xsd
@@ -9,7 +9,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas b/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas
index 680343decd..ce79ed02c8 100644
--- a/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-jdbc/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-5.0.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-5.0.xsd
-http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-5.0.xsd
+http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-5.1.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-5.1.xsd
+http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-5.1.xsd
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.0.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.1.xsd
similarity index 99%
rename from spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.0.xsd
rename to spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.1.xsd
index 952165a47b..8743d80e24 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.0.xsd
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.1.xsd
@@ -7,7 +7,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-jms/src/main/resources/META-INF/spring.schemas b/spring-integration-jms/src/main/resources/META-INF/spring.schemas
index 42075a2da3..7b12a04ffd 100644
--- a/spring-integration-jms/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-jms/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/jms/spring-integration-jms-5.0.xsd=org/springframework/integration/jms/config/spring-integration-jms-5.0.xsd
-http\://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd=org/springframework/integration/jms/config/spring-integration-jms-5.0.xsd
+http\://www.springframework.org/schema/integration/jms/spring-integration-jms-5.1.xsd=org/springframework/integration/jms/config/spring-integration-jms-5.1.xsd
+http\://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd=org/springframework/integration/jms/config/spring-integration-jms-5.1.xsd
diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.0.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.1.xsd
similarity index 99%
rename from spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.0.xsd
rename to spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.1.xsd
index d5e13e2e8c..c1097901c4 100644
--- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.0.xsd
+++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.1.xsd
@@ -11,7 +11,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-jmx/src/main/resources/META-INF/spring.schemas b/spring-integration-jmx/src/main/resources/META-INF/spring.schemas
index e74ee6d4a6..bfbc776e70 100644
--- a/spring-integration-jmx/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-jmx/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-5.0.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-5.0.xsd
-http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-5.0.xsd
+http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-5.1.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-5.1.xsd
+http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-5.1.xsd
diff --git a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.0.xsd b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.1.xsd
similarity index 99%
rename from spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.0.xsd
rename to spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.1.xsd
index 245dd6995d..77d6a271da 100644
--- a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.0.xsd
+++ b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.1.xsd
@@ -8,7 +8,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-jpa/src/main/resources/META-INF/spring.schemas b/spring-integration-jpa/src/main/resources/META-INF/spring.schemas
index fdba2ba67d..2ef85eaf4a 100644
--- a/spring-integration-jpa/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-jpa/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-5.0.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-5.0.xsd
-http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-5.0.xsd
+http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-5.1.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-5.1.xsd
+http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-5.1.xsd
diff --git a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.0.xsd b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.1.xsd
similarity index 99%
rename from spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.0.xsd
rename to spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.1.xsd
index 66e689c17c..40472b4090 100644
--- a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.0.xsd
+++ b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.1.xsd
@@ -9,7 +9,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-mail/src/main/resources/META-INF/spring.schemas b/spring-integration-mail/src/main/resources/META-INF/spring.schemas
index 22246eac05..64cbf8e75a 100644
--- a/spring-integration-mail/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-mail/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.0.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.0.xsd
-http\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.0.xsd
+http\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.1.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.1.xsd
+http\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.1.xsd
diff --git a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.0.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.1.xsd
similarity index 99%
rename from spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.0.xsd
rename to spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.1.xsd
index 7885f9d6c7..eca6284670 100644
--- a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.0.xsd
+++ b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.1.xsd
@@ -11,7 +11,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas b/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas
index c4dddb031e..cfca838039 100644
--- a/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-mongodb/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.0.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.0.xsd
-http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.0.xsd
+http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.1.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.1.xsd
+http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.1.xsd
diff --git a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.0.xsd b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.1.xsd
similarity index 99%
rename from spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.0.xsd
rename to spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.1.xsd
index 80e176ff22..58e9a157cc 100644
--- a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.0.xsd
+++ b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.1.xsd
@@ -8,7 +8,7 @@
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas b/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas
index d413c7e6fe..41b198d441 100644
--- a/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-5.0.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-5.0.xsd
-http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-5.0.xsd
+http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-5.1.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-5.1.xsd
+http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-5.1.xsd
diff --git a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.0.xsd b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.1.xsd
similarity index 99%
rename from spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.0.xsd
rename to spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.1.xsd
index 6837293d54..9eea140282 100644
--- a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.0.xsd
+++ b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.1.xsd
@@ -9,7 +9,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-redis/src/main/resources/META-INF/spring.schemas b/spring-integration-redis/src/main/resources/META-INF/spring.schemas
index 221e3d99cf..ac7dfe663e 100644
--- a/spring-integration-redis/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-redis/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/redis/spring-integration-redis-5.0.xsd=org/springframework/integration/redis/config/spring-integration-redis-5.0.xsd
-http\://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-5.0.xsd
+http\://www.springframework.org/schema/integration/redis/spring-integration-redis-5.1.xsd=org/springframework/integration/redis/config/spring-integration-redis-5.1.xsd
+http\://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-5.1.xsd
diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.0.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.1.xsd
similarity index 99%
rename from spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.0.xsd
rename to spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.1.xsd
index f30e11bc02..c837d14b27 100644
--- a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.0.xsd
+++ b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.1.xsd
@@ -8,7 +8,7 @@
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-rmi/src/main/resources/META-INF/spring.schemas b/spring-integration-rmi/src/main/resources/META-INF/spring.schemas
index 832084299b..3ba0ae2d83 100644
--- a/spring-integration-rmi/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-rmi/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-5.0.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-5.0.xsd
-http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-5.0.xsd
+http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-5.1.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-5.1.xsd
+http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-5.1.xsd
diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.0.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.1.xsd
similarity index 99%
rename from spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.0.xsd
rename to spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.1.xsd
index 6f3807689c..8ae5dce694 100644
--- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.0.xsd
+++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.1.xsd
@@ -10,7 +10,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-scripting/src/main/resources/META-INF/spring.schemas b/spring-integration-scripting/src/main/resources/META-INF/spring.schemas
index 4719eb7c13..53525ab8d3 100644
--- a/spring-integration-scripting/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-scripting/src/main/resources/META-INF/spring.schemas
@@ -1,4 +1,4 @@
-http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.0.xsd
-http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.0.xsd
-http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.0.xsd
-http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.0.xsd
+http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.1.xsd
+http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.1.xsd
+http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.1.xsd
+http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.1.xsd
diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.0.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.1.xsd
similarity index 96%
rename from spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.0.xsd
rename to spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.1.xsd
index d3b47ad334..df846b4ad8 100644
--- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.0.xsd
+++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.1.xsd
@@ -5,7 +5,7 @@
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xsd:include
-		schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.1.xsd" />
 
 	<xsd:element name="script">
 		<xsd:annotation>
diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.0.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.1.xsd
similarity index 99%
rename from spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.0.xsd
rename to spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.1.xsd
index 4c3817199a..90fc3e8ee4 100644
--- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.0.xsd
+++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.1.xsd
@@ -8,7 +8,7 @@
 
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 
 	<xsd:complexType name="ScriptType" mixed="true" abstract="true">
diff --git a/spring-integration-security/src/main/resources/META-INF/spring.schemas b/spring-integration-security/src/main/resources/META-INF/spring.schemas
index e485bb4181..185e1a21bb 100644
--- a/spring-integration-security/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-security/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/security/spring-integration-security-5.0.xsd=org/springframework/integration/security/config/spring-integration-security-5.0.xsd
-http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-5.0.xsd
+http\://www.springframework.org/schema/integration/security/spring-integration-security-5.1.xsd=org/springframework/integration/security/config/spring-integration-security-5.1.xsd
+http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-5.1.xsd
diff --git a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.0.xsd b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.1.xsd
similarity index 100%
rename from spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.0.xsd
rename to spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.1.xsd
diff --git a/spring-integration-sftp/src/main/resources/META-INF/spring.schemas b/spring-integration-sftp/src/main/resources/META-INF/spring.schemas
index 30b9dabf7e..90a50e4e19 100644
--- a/spring-integration-sftp/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-sftp/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd
-http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd
+http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.1.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd
+http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd
diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd
similarity index 99%
rename from spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd
rename to spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd
index ba5265367b..e334feb82f 100644
--- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd
+++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd
@@ -10,9 +10,9 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration/file"
-		schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-5.1.xsd" />
 
 	<xsd:element name="outbound-channel-adapter">
 		<xsd:annotation>
diff --git a/spring-integration-stomp/src/main/resources/META-INF/spring.schemas b/spring-integration-stomp/src/main/resources/META-INF/spring.schemas
index 11e8dc8ba9..7647e70e27 100644
--- a/spring-integration-stomp/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-stomp/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.0.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd
-http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd
+http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.1.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd
+http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd
diff --git a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd
similarity index 99%
rename from spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd
rename to spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd
index b5f0025673..f62e6c13cc 100644
--- a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd
+++ b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd
@@ -10,7 +10,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-stream/src/main/resources/META-INF/spring.schemas b/spring-integration-stream/src/main/resources/META-INF/spring.schemas
index 364ac2f2fc..5bf4918cf0 100644
--- a/spring-integration-stream/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-stream/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/stream/spring-integration-stream-5.0.xsd=org/springframework/integration/stream/config/spring-integration-stream-5.0.xsd
-http\://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd=org/springframework/integration/stream/config/spring-integration-stream-5.0.xsd
+http\://www.springframework.org/schema/integration/stream/spring-integration-stream-5.1.xsd=org/springframework/integration/stream/config/spring-integration-stream-5.1.xsd
+http\://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd=org/springframework/integration/stream/config/spring-integration-stream-5.1.xsd
diff --git a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-5.0.xsd b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-5.1.xsd
similarity index 98%
rename from spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-5.0.xsd
rename to spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-5.1.xsd
index 81bdcf8835..54ab910924 100644
--- a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-5.0.xsd
+++ b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-5.1.xsd
@@ -11,7 +11,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-syslog/src/main/resources/META-INF/spring.schemas b/spring-integration-syslog/src/main/resources/META-INF/spring.schemas
index add4740645..1e8eeb2e8d 100644
--- a/spring-integration-syslog/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-syslog/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-5.0.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-5.0.xsd
-http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-5.0.xsd
+http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-5.1.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-5.1.xsd
+http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-5.1.xsd
diff --git a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.0.xsd b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.1.xsd
similarity index 98%
rename from spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.0.xsd
rename to spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.1.xsd
index d661533d0e..eee11333fc 100644
--- a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.0.xsd
+++ b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.1.xsd
@@ -10,9 +10,9 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration/ip"
-		schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-5.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-twitter/src/main/resources/META-INF/spring.schemas b/spring-integration-twitter/src/main/resources/META-INF/spring.schemas
index 1868999a73..18cbab5d99 100644
--- a/spring-integration-twitter/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-twitter/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter-5.0.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-5.0.xsd
-http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-5.0.xsd
+http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter-5.1.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-5.1.xsd
+http\://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd=org/springframework/integration/twitter/config/spring-integration-twitter-5.1.xsd
diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-5.0.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-5.1.xsd
similarity index 99%
rename from spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-5.0.xsd
rename to spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-5.1.xsd
index c214499f96..cefdaf2a67 100644
--- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-5.0.xsd
+++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-5.1.xsd
@@ -11,7 +11,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
 	<!--
 		INBOUND
diff --git a/spring-integration-webflux/src/main/resources/META-INF/spring.schemas b/spring-integration-webflux/src/main/resources/META-INF/spring.schemas
index 490f885418..4beab069bf 100644
--- a/spring-integration-webflux/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-webflux/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux-5.0.xsd=org/springframework/integration/webflux/config/spring-integration-webflux-5.0.xsd
-http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux.xsd=org/springframework/integration/webflux/config/spring-integration-webflux-5.0.xsd
+http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux-5.1.xsd=org/springframework/integration/webflux/config/spring-integration-webflux-5.1.xsd
+http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux.xsd=org/springframework/integration/webflux/config/spring-integration-webflux-5.1.xsd
diff --git a/spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.0.xsd b/spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.1.xsd
similarity index 99%
rename from spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.0.xsd
rename to spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.1.xsd
index 6683204459..fb2dd3937f 100644
--- a/spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.0.xsd
+++ b/spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.1.xsd
@@ -10,9 +10,9 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration/http"
-				schemaLocation="http://www.springframework.org/schema/integration/http/spring-integration-http-5.0.xsd"/>
+				schemaLocation="http://www.springframework.org/schema/integration/http/spring-integration-http-5.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-websocket/src/main/resources/META-INF/spring.schemas b/spring-integration-websocket/src/main/resources/META-INF/spring.schemas
index 6d39a4f3f4..19f300e05c 100644
--- a/spring-integration-websocket/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-websocket/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-5.0.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-5.0.xsd
-http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-5.0.xsd
+http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-5.1.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-5.1.xsd
+http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-5.1.xsd
diff --git a/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.0.xsd b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.1.xsd
similarity index 99%
rename from spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.0.xsd
rename to spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.1.xsd
index 90d57443b0..578ce444c1 100644
--- a/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.0.xsd
+++ b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.1.xsd
@@ -11,7 +11,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-ws/src/main/resources/META-INF/spring.schemas b/spring-integration-ws/src/main/resources/META-INF/spring.schemas
index e6871e1165..1d2dd6d94d 100644
--- a/spring-integration-ws/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-ws/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/ws/spring-integration-ws-5.0.xsd=org/springframework/integration/ws/config/spring-integration-ws-5.0.xsd
-http\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws-5.0.xsd
+http\://www.springframework.org/schema/integration/ws/spring-integration-ws-5.1.xsd=org/springframework/integration/ws/config/spring-integration-ws-5.1.xsd
+http\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws-5.1.xsd
diff --git a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.0.xsd b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.1.xsd
similarity index 99%
rename from spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.0.xsd
rename to spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.1.xsd
index 9ddd87901c..c276b26e29 100644
--- a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.0.xsd
+++ b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.1.xsd
@@ -11,7 +11,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-xml/src/main/resources/META-INF/spring.schemas b/spring-integration-xml/src/main/resources/META-INF/spring.schemas
index 55b4dab3a1..9750243d8b 100644
--- a/spring-integration-xml/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-xml/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.0.xsd
-http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.0.xsd
+http\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.1.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.1.xsd
+http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.1.xsd
diff --git a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.0.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.1.xsd
similarity index 99%
rename from spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.0.xsd
rename to spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.1.xsd
index e558f384d0..786f7b50a4 100644
--- a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.0.xsd
+++ b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.1.xsd
@@ -10,7 +10,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation>
diff --git a/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas b/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas
index 8e3110a9e5..c612a349e4 100644
--- a/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-xmpp/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-5.0.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-5.0.xsd
-http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-5.0.xsd
+http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-5.1.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-5.1.xsd
+http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-5.1.xsd
diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.0.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.1.xsd
similarity index 99%
rename from spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.0.xsd
rename to spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.1.xsd
index 3a4fac93c6..f8e2c73872 100644
--- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.0.xsd
+++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.1.xsd
@@ -11,7 +11,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>
 
 	<xsd:element name="xmpp-connection">
 		<xsd:annotation>
diff --git a/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas b/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas
index fe78a22868..7c5064ccee 100644
--- a/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas
+++ b/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-5.0.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.0.xsd
-http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.0.xsd
+http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-5.1.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.1.xsd
+http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.1.xsd
diff --git a/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.0.xsd b/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.1.xsd
similarity index 98%
rename from spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.0.xsd
rename to spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.1.xsd
index be9b82b9bb..bd74f696f8 100644
--- a/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.0.xsd
+++ b/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.1.xsd
@@ -9,7 +9,7 @@
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[