From 04a42f54beea17454dc5c28b0060ade9aff0c80e Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 18 Aug 2016 14:19:32 -0400 Subject: [PATCH] Rename Schemas to 5.0 Fix Schema Imports spring.schemas --- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-amqp-4.3.xsd => spring-integration-amqp-5.0.xsd} | 2 +- .../config/xml/AbstractIntegrationNamespaceHandler.java | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ing-integration-4.3.xsd => spring-integration-5.0.xsd} | 0 .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ion-event-4.3.xsd => spring-integration-event-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-feed-4.3.xsd => spring-integration-feed-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-file-4.3.xsd => spring-integration-file-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-ftp-4.3.xsd => spring-integration-ftp-5.0.xsd} | 4 ++-- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gemfire-4.3.xsd => spring-integration-gemfire-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...n-groovy-4.3.xsd => spring-integration-groovy-5.0.xsd} | 4 ++-- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-http-4.3.xsd => spring-integration-http-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...tegration-ip-4.3.xsd => spring-integration-ip-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-jdbc-4.3.xsd => spring-integration-jdbc-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-jms-4.3.xsd => spring-integration-jms-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-jmx-4.3.xsd => spring-integration-jmx-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-jpa-4.3.xsd => spring-integration-jpa-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-mail-4.3.xsd => spring-integration-mail-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...mongodb-4.3.xsd => spring-integration-mongodb-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-mqtt-4.3.xsd => spring-integration-mqtt-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ion-redis-4.3.xsd => spring-integration-redis-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-rmi-4.3.xsd => spring-integration-rmi-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 8 ++++---- ...pting-4.3.xsd => spring-integration-scripting-5.0.xsd} | 2 +- ...-4.3.xsd => spring-integration-scripting-core-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...curity-4.3.xsd => spring-integration-security-5.0.xsd} | 0 .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-sftp-4.3.xsd => spring-integration-sftp-5.0.xsd} | 4 ++-- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ion-stomp-4.3.xsd => spring-integration-stomp-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...n-stream-4.3.xsd => spring-integration-stream-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...n-syslog-4.3.xsd => spring-integration-syslog-5.0.xsd} | 4 ++-- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...twitter-4.3.xsd => spring-integration-twitter-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ocket-4.3.xsd => spring-integration-websocket-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...tegration-ws-4.3.xsd => spring-integration-ws-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-xml-4.3.xsd => spring-integration-xml-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-xmpp-4.3.xsd => spring-integration-xmpp-5.0.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...eeper-4.3.xsd => spring-integration-zookeeper-5.0.xsd} | 2 +- 64 files changed, 99 insertions(+), 99 deletions(-) rename spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/{spring-integration-amqp-4.3.xsd => spring-integration-amqp-5.0.xsd} (99%) rename spring-integration-core/src/main/resources/org/springframework/integration/config/{spring-integration-4.3.xsd => spring-integration-5.0.xsd} (100%) rename spring-integration-event/src/main/resources/org/springframework/integration/event/config/{spring-integration-event-4.3.xsd => spring-integration-event-5.0.xsd} (99%) rename spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/{spring-integration-feed-4.3.xsd => spring-integration-feed-5.0.xsd} (99%) rename spring-integration-file/src/main/resources/org/springframework/integration/file/config/{spring-integration-file-4.3.xsd => spring-integration-file-5.0.xsd} (99%) rename spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/{spring-integration-ftp-4.3.xsd => spring-integration-ftp-5.0.xsd} (99%) rename spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/{spring-integration-gemfire-4.3.xsd => spring-integration-gemfire-5.0.xsd} (99%) rename spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/{spring-integration-groovy-4.3.xsd => spring-integration-groovy-5.0.xsd} (97%) rename spring-integration-http/src/main/resources/org/springframework/integration/http/config/{spring-integration-http-4.3.xsd => spring-integration-http-5.0.xsd} (99%) rename spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/{spring-integration-ip-4.3.xsd => spring-integration-ip-5.0.xsd} (99%) rename spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/{spring-integration-jdbc-4.3.xsd => spring-integration-jdbc-5.0.xsd} (99%) rename spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/{spring-integration-jms-4.3.xsd => spring-integration-jms-5.0.xsd} (99%) rename spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/{spring-integration-jmx-4.3.xsd => spring-integration-jmx-5.0.xsd} (99%) rename spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/{spring-integration-jpa-4.3.xsd => spring-integration-jpa-5.0.xsd} (99%) rename spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/{spring-integration-mail-4.3.xsd => spring-integration-mail-5.0.xsd} (99%) rename spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/{spring-integration-mongodb-4.3.xsd => spring-integration-mongodb-5.0.xsd} (99%) rename spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/{spring-integration-mqtt-4.3.xsd => spring-integration-mqtt-5.0.xsd} (99%) rename spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/{spring-integration-redis-4.3.xsd => spring-integration-redis-5.0.xsd} (99%) rename spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/{spring-integration-rmi-4.3.xsd => spring-integration-rmi-5.0.xsd} (99%) rename spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/{spring-integration-scripting-4.3.xsd => spring-integration-scripting-5.0.xsd} (96%) rename spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/{spring-integration-scripting-core-4.3.xsd => spring-integration-scripting-core-5.0.xsd} (99%) rename spring-integration-security/src/main/resources/org/springframework/integration/security/config/{spring-integration-security-4.3.xsd => spring-integration-security-5.0.xsd} (100%) rename spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/{spring-integration-sftp-4.3.xsd => spring-integration-sftp-5.0.xsd} (99%) rename spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/{spring-integration-stomp-4.3.xsd => spring-integration-stomp-5.0.xsd} (99%) rename spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/{spring-integration-stream-4.3.xsd => spring-integration-stream-5.0.xsd} (98%) rename spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/{spring-integration-syslog-4.3.xsd => spring-integration-syslog-5.0.xsd} (98%) rename spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/{spring-integration-twitter-4.3.xsd => spring-integration-twitter-5.0.xsd} (99%) rename spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/{spring-integration-websocket-4.3.xsd => spring-integration-websocket-5.0.xsd} (99%) rename spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/{spring-integration-ws-4.3.xsd => spring-integration-ws-5.0.xsd} (99%) rename spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/{spring-integration-xml-4.3.xsd => spring-integration-xml-5.0.xsd} (99%) rename spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/{spring-integration-xmpp-4.3.xsd => spring-integration-xmpp-5.0.xsd} (99%) rename spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/{spring-integration-zookeeper-4.3.xsd => spring-integration-zookeeper-5.0.xsd} (98%) 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 38a275b7c9..f60ef6be4b 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-4.3.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd +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 diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd similarity index 99% rename from spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd rename to spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd index 58549adb1a..7b2e9e4d8c 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd @@ -9,7 +9,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/> 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 efe0728900..58d54df809 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 @@ -44,7 +44,7 @@ public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHa protected final Log logger = LogFactory.getLog(this.getClass()); - private static final String VERSION = "4.3"; + private static final String VERSION = "5.0"; private final NamespaceHandlerDelegate delegate = new NamespaceHandlerDelegate(); 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 ce566aeee2..e234cb04e3 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-4.3.xsd=org/springframework/integration/config/spring-integration-4.3.xsd -http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/spring-integration-4.3.xsd +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 diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.0.xsd similarity index 100% rename from spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd rename to spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.0.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 10914c78bd..c82ead7a5a 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-4.3.xsd=org/springframework/integration/event/config/spring-integration-event-4.3.xsd -http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-4.3.xsd +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 diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.3.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.0.xsd similarity index 99% rename from spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.3.xsd rename to spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.0.xsd index 1ce723d2e5..e8c2375dfa 100644 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.3.xsd +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.0.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> 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 2eab28d075..bf02e4bdb5 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-4.3.xsd=org/springframework/integration/file/config/spring-integration-file-4.3.xsd -http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-4.3.xsd +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 diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.3.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.0.xsd similarity index 99% rename from spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.3.xsd rename to spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.0.xsd index 90e862007d..dabda9e370 100644 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.3.xsd +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.0.xsd @@ -10,7 +10,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-5.0.xsd" /> 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 21fc579a93..1694ebee78 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-4.3.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd +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 diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd similarity index 99% rename from spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd rename to spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd index 98570a2f27..a797b3e872 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd @@ -10,7 +10,7 @@ schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> 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 79642c6bb6..86bf9752b2 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-4.3.xsd=org/springframework/integration/http/config/spring-integration-http-4.3.xsd -http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-4.3.xsd +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 diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.3.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.0.xsd similarity index 99% rename from spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.3.xsd rename to spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.0.xsd index 6a166e437b..d8c49e3fc3 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.3.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.0.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.0.xsd" /> diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.3.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.0.xsd similarity index 99% rename from spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.3.xsd rename to spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.0.xsd index 3bc91263b6..4c3817199a 100644 --- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.3.xsd +++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.0.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> 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 42acf6127d..e485bb4181 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-4.3.xsd=org/springframework/integration/security/config/spring-integration-security-4.3.xsd -http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-4.3.xsd +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 diff --git a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-4.3.xsd b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.0.xsd similarity index 100% rename from spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-4.3.xsd rename to spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.0.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 3b4d75267a..30b9dabf7e 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-4.3.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd +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 diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd similarity index 99% rename from spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd rename to spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd index 3e9813301a..2b7c4cb279 100644 --- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd +++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd @@ -10,9 +10,9 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-5.0.xsd" /> 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 c23412eb83..11e8dc8ba9 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-4.3.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd -http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd +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 diff --git a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd similarity index 99% rename from spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd rename to spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd index 99291e5d17..b5f0025673 100644 --- a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd +++ b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd @@ -10,7 +10,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-5.0.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.0.xsd"/>