From f5145f531bb3b7078c097cc825c89c4f3ad802fb Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@gopivotal.com>
Date: Fri, 30 May 2014 21:05:25 +0300
Subject: [PATCH] INT-3418: Final Phase: Cleanup

INT-3418: use versioned XSDs for XSD import
---
 build.gradle                                                 | 2 +-
 .../integration/amqp/config/spring-integration-amqp-4.1.xsd  | 2 +-
 .../event/config/spring-integration-event-4.1.xsd            | 2 +-
 .../integration/feed/config/spring-integration-feed-4.1.xsd  | 2 +-
 .../integration/file/config/spring-integration-file-4.1.xsd  | 2 +-
 .../integration/ftp/config/spring-integration-ftp-4.1.xsd    | 4 ++--
 .../gemfire/config/xml/spring-integration-gemfire-4.1.xsd    | 2 +-
 .../groovy/config/spring-integration-groovy-4.1.xsd          | 5 +++--
 .../integration/http/config/spring-integration-http-4.1.xsd  | 2 +-
 .../integration/ip/config/spring-integration-ip-4.1.xsd      | 2 +-
 .../integration/jdbc/config/spring-integration-jdbc-4.1.xsd  | 3 ++-
 .../integration/jms/config/spring-integration-jms-4.1.xsd    | 2 +-
 .../integration/jmx/config/spring-integration-jmx-4.1.xsd    | 3 ++-
 .../jpa/config/xml/spring-integration-jpa-4.1.xsd            | 2 +-
 .../integration/mail/config/spring-integration-mail-4.1.xsd  | 2 +-
 .../mongodb/config/spring-integration-mongodb-4.1.xsd        | 2 +-
 .../mqtt/config/xml/spring-integration-mqtt-4.1.xsd          | 2 +-
 .../redis/config/spring-integration-redis-4.1.xsd            | 2 +-
 .../integration/rmi/config/spring-integration-rmi-4.1.xsd    | 2 +-
 .../scripting/config/spring-integration-scripting-4.1.xsd    | 2 +-
 .../config/spring-integration-scripting-core-4.1.xsd         | 2 +-
 .../integration/sftp/config/spring-integration-sftp-4.1.xsd  | 4 ++--
 .../stream/config/spring-integration-stream-4.1.xsd          | 2 +-
 .../syslog/config/spring-integration-syslog-4.1.xsd          | 4 ++--
 .../twitter/config/spring-integration-twitter-4.1.xsd        | 2 +-
 .../websocket/config/spring-integration-websocket-4.1.xsd    | 2 +-
 .../integration/ws/config/spring-integration-ws-4.1.xsd      | 2 +-
 .../integration/xml/config/spring-integration-xml-4.1.xsd    | 2 +-
 .../integration/xmpp/config/spring-integration-xmpp-4.1.xsd  | 2 +-
 29 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/build.gradle b/build.gradle
index e055fa66e1..6c70b7f989 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,7 +101,7 @@ subprojects { subproject ->
 		openJpaVersion = '2.3.0'
 		pahoMqttClientVersion = '0.4.0'
 		postgresVersion = '9.1-901-1.jdbc4'
-		reactorVersion = '1.1.0.RELEASE'
+		reactorVersion = '1.1.2.RELEASE'
 		romeVersion = '1.0.0'
 		saajApiVersion = '1.3.5'
 		saajImplVersion = '1.3.23'
diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd
index 2fba35dc8e..95d528ac1b 100644
--- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd
+++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.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-4.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
 
 	<xsd:element name="outbound-channel-adapter">
 		<xsd:annotation>
diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.1.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.1.xsd
index cc42258eb6..3b2affaaa2 100644
--- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.1.xsd
+++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.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-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd
index 0a03e954df..ffbc255dd7 100644
--- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd
+++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.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-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 	<xsd:element name="inbound-channel-adapter">
 		<xsd:annotation>
diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.1.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.1.xsd
index 21bc31d199..dcfb187932 100644
--- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.1.xsd
+++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.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-4.0.xsd"/>
+                schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
 
     <xsd:annotation>
         <xsd:documentation><![CDATA[
diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd
index 25dc7e44eb..89d955e144 100644
--- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd
+++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.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-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration/file"
-		schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd" />
 
 	<xsd:element name="outbound-channel-adapter">
 		<xsd:annotation>
diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd
index e09f207d0d..514c27558c 100644
--- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd
+++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.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.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.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/org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd
index c91038cabd..8b8711641d 100644
--- a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd
+++ b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd
@@ -7,10 +7,11 @@
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xsd:include
-		schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd"
+		schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.1.xsd"
 		/>
 
-	<xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 	<xsd:element name="script" type="GroovyScript">
 		<xsd:annotation>
diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.1.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.1.xsd
index 46a29c940e..4041a7c196 100644
--- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.1.xsd
+++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.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-4.0.xsd" />
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd
index e9f9d0119c..ec4fc0dd5e 100644
--- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd
+++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.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-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.1.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.1.xsd
index 719fcfab03..e469871f51 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.1.xsd
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.1.xsd
@@ -6,7 +6,8 @@
 
 	<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-4.0.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.1.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.1.xsd
index de57ec762e..92b49d9c42 100644
--- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.1.xsd
+++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.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-4.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.1.xsd b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.1.xsd
index 6691dc9225..06f3626832 100644
--- a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.1.xsd
+++ b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.1.xsd
@@ -6,7 +6,8 @@
 
 	<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-4.0.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.1.xsd b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.1.xsd
index 8507c91236..a5ef22d82c 100644
--- a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.1.xsd
+++ b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.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-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.1.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.1.xsd
index e7d19fc3b2..d4857ab42e 100644
--- a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.1.xsd
+++ b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.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-4.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-4.1.xsd b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-4.1.xsd
index 90726a84f2..5fec72cdb5 100644
--- a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-4.1.xsd
+++ b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-4.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-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.1.xsd b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.1.xsd
index 3f11fe6e2c..9994058c2c 100644
--- a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.1.xsd
+++ b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.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.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.1.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.1.xsd
index cdd383d0eb..bd70304b08 100644
--- a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.1.xsd
+++ b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.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-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.1.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.1.xsd
index a0b2114a4f..1832e0bf51 100644
--- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.1.xsd
+++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.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-4.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.1.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.1.xsd
index dc1bdbe640..5aa2740a44 100644
--- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.1.xsd
+++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.1.xsd
@@ -5,7 +5,7 @@
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xsd:include
-		schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.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-4.1.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.1.xsd
index c94baee611..057efe3509 100644
--- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.1.xsd
+++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.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-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 
 
 	<xsd:complexType name="ScriptType" mixed="true" abstract="true">
diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd
index 118b7bcca5..017d4a948c 100644
--- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd
+++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.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-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration/file"
-		schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd" />
 
 	<xsd:element name="outbound-channel-adapter">
 		<xsd:annotation>
diff --git a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.1.xsd b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.1.xsd
index 5f4879c3a0..9b7e485e0e 100644
--- a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.1.xsd
+++ b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.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-4.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-4.1.xsd b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-4.1.xsd
index cbc4f31222..3b6513796d 100644
--- a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-4.1.xsd
+++ b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-4.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-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration/ip"
-		schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-4.0.xsd" />
+		schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-4.1.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.1.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.1.xsd
index e810d9989b..03cfe1477a 100644
--- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.1.xsd
+++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.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-4.0.xsd"/>
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
 
 	<!--
 		INBOUND
diff --git a/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.1.xsd b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.1.xsd
index 135e445abc..438a1912c1 100644
--- a/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.1.xsd
+++ b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.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.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-4.1.xsd b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-4.1.xsd
index 3c1fbb2075..ae2bd7289d 100644
--- a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-4.1.xsd
+++ b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-4.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-4.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.1.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.1.xsd
index 57ca763388..07149ab7c4 100644
--- a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.1.xsd
+++ b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.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-4.0.xsd"/>
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation>
diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.1.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.1.xsd
index 9bd304b8e4..bb20ec02c4 100644
--- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.1.xsd
+++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.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-4.0.xsd"/>
+				schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
 
 	<xsd:element name="xmpp-connection">
 		<xsd:annotation>