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"/>