diff --git a/build.gradle b/build.gradle index 76811213ba..493e7f5e2b 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,7 @@ subprojects { subproject -> hsqldbVersion = '2.4.1' h2Version = '1.4.197' jackson2Version = '2.9.8' - javaxActivationVersion = '1.1.1' + javaxActivationVersion = '1.2.0' javaxMailVersion = '1.6.2' jmsApiVersion = '2.0.1' jpa21ApiVersion = '1.0.0.Final' @@ -132,16 +132,16 @@ subprojects { subproject -> reactorNettyVersion = '0.8.5.RELEASE' reactorVersion = '3.2.6.RELEASE' romeToolsVersion = '1.9.0' - servletApiVersion = '4.0.0' + servletApiVersion = '4.0.1' smackVersion = '4.3.1' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.4.RELEASE' - springDataJpaVersion = '2.1.5.RELEASE' - springDataMongoVersion = '2.1.5.RELEASE' - springDataRedisVersion = '2.1.5.RELEASE' - springGemfireVersion = '2.1.5.RELEASE' - springSecurityVersion = '5.1.4.RELEASE' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.0.BUILD-SNAPSHOT' + springDataJpaVersion = '2.2.0.BUILD-SNAPSHOT' + springDataMongoVersion = '2.2.0.BUILD-SNAPSHOT' + springDataRedisVersion = '2.2.0.BUILD-SNAPSHOT' + springGemfireVersion = '2.2.0.BUILD-SNAPSHOT' + springSecurityVersion = '5.2.0.BUILD-SNAPSHOT' springRetryVersion = '1.2.4.RELEASE' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.5.RELEASE' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.BUILD-SNAPSHOT' springWsVersion = '3.0.6.RELEASE' tomcatVersion = "9.0.16" xstreamVersion = '1.4.11.1' @@ -418,7 +418,7 @@ project('spring-integration-ftp') { compile project(":spring-integration-file") compile "commons-net:commons-net:$commonsNetVersion" compile "org.springframework:spring-context-support:$springVersion" - compile("javax.activation:activation:$javaxActivationVersion", optional) + compile("javax.activation:javax.activation-api:$javaxActivationVersion", optional) testCompile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" testCompile project(":spring-integration-file").sourceSets.test.output @@ -555,7 +555,7 @@ project('spring-integration-mail') { compile("javax.mail:javax.mail-api:$javaxMailVersion", provided) compile("com.sun.mail:imap:$javaxMailVersion", provided) compile("com.sun.mail:javax.mail:$javaxMailVersion", provided); - compile("javax.activation:activation:$javaxActivationVersion", optional) + compile("javax.activation:javax.activation-api:$javaxActivationVersion", optional) } // suppress javax.activation path warnings @@ -630,7 +630,7 @@ project('spring-integration-sftp') { compile project(":spring-integration-stream") compile "com.jcraft:jsch:$jschVersion" compile "org.springframework:spring-context-support:$springVersion" - compile("javax.activation:activation:$javaxActivationVersion", optional) + compile("javax.activation:javax.activation-api:$javaxActivationVersion", optional) testCompile "org.apache.sshd:sshd-core:$apacheSshdVersion" testCompile "org.apache.sshd:sshd-sftp:$apacheSshdVersion" diff --git a/gradle.properties b/gradle.properties index fa9ef2b6dd..c91267f063 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=5.1.4.BUILD-SNAPSHOT +version=5.2.0.BUILD-SNAPSHOT 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 ed748d7290..e9a13090c7 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.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 +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd similarity index 100% rename from spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd rename to spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.2.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 b2dcfabcc6..e7549b9029 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-2018 the original author or authors. + * Copyright 2002-2019 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.1"; + private static final String VERSION = "5.2"; 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 c102570d9a..b399c010df 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.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 +http\://www.springframework.org/schema/integration/spring-integration-5.2.xsd=org/springframework/integration/config/spring-integration-5.2.xsd +http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/spring-integration-5.2.xsd diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.1.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.2.xsd similarity index 100% rename from spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.1.xsd rename to spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.2.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 ada3f7ab52..b644540033 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.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 +http\://www.springframework.org/schema/integration/event/spring-integration-event-5.2.xsd=org/springframework/integration/event/config/spring-integration-event-5.2.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-5.2.xsd diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.1.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.2.xsd similarity index 100% rename from spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.1.xsd rename to spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.2.xsd 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 9d3f898206..10b3be2316 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.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 +http\://www.springframework.org/schema/integration/feed/spring-integration-feed-5.2.xsd=org/springframework/integration/feed/config/spring-integration-feed-5.2.xsd +http\://www.springframework.org/schema/integration/feed/spring-integration-feed.xsd=org/springframework/integration/feed/config/spring-integration-feed-5.2.xsd diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-5.1.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-5.2.xsd similarity index 100% rename from spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-5.1.xsd rename to spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-5.2.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 3c149fcc14..bc6bcc8d48 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.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 +http\://www.springframework.org/schema/integration/file/spring-integration-file-5.2.xsd=org/springframework/integration/file/config/spring-integration-file-5.2.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-5.2.xsd diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.2.xsd similarity index 100% rename from spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd rename to spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.2.xsd 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 6ca9613869..2417436eab 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.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 +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-5.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd +http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.1.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.2.xsd similarity index 100% rename from spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.1.xsd rename to spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.2.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 0d307e22a5..9456d489e2 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.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 +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd similarity index 100% rename from spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd rename to spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.2.xsd 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 2dc5c39da9..ac2dbebd60 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.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 +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-5.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-5.2.xsd +http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-5.2.xsd diff --git a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.1.xsd b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.2.xsd similarity index 100% rename from spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.1.xsd rename to spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-5.2.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 28418d3ac0..48a8667059 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.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 +http\://www.springframework.org/schema/integration/http/spring-integration-http-5.2.xsd=org/springframework/integration/http/config/spring-integration-http-5.2.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-5.2.xsd diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.2.xsd similarity index 100% rename from spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd rename to spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.2.xsd 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 e0be4e80d2..765f1bc0c9 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.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 +http\://www.springframework.org/schema/integration/ip/spring-integration-ip-5.2.xsd=org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd +http\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.1.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd similarity index 100% rename from spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.1.xsd rename to spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.2.xsd 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 ce79ed02c8..6de41b72c6 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.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 +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-5.2.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd +http\://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd=org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.1.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd similarity index 100% rename from spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.1.xsd rename to spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.2.xsd 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 7b12a04ffd..245b5dd97c 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.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 +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-5.2.xsd=org/springframework/integration/jms/config/spring-integration-jms-5.2.xsd +http\://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd=org/springframework/integration/jms/config/spring-integration-jms-5.2.xsd diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.1.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.2.xsd similarity index 100% rename from spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.1.xsd rename to spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.2.xsd 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 bfbc776e70..3eb1be73ee 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.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 +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx-5.2.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-5.2.xsd +http\://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd=org/springframework/integration/jmx/config/spring-integration-jmx-5.2.xsd diff --git a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.1.xsd b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.2.xsd similarity index 100% rename from spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.1.xsd rename to spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-5.2.xsd 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 2ef85eaf4a..21cce3524c 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.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 +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-5.2.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-5.2.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-5.2.xsd diff --git a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.1.xsd b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.2.xsd similarity index 100% rename from spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.1.xsd rename to spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-5.2.xsd 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 64cbf8e75a..70ec9d66a3 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.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 +http\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.2.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd +http\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd diff --git a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.1.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd similarity index 100% rename from spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.1.xsd rename to spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd 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 cfca838039..7273d61490 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.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 +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-5.2.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd +http\://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd=org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd diff --git a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.1.xsd b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd similarity index 100% rename from spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.1.xsd rename to spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-5.2.xsd 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 41b198d441..2d0fd3cacc 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.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 +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-5.2.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-5.2.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-5.2.xsd diff --git a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.1.xsd b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.2.xsd similarity index 100% rename from spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.1.xsd rename to spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-5.2.xsd 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 ac7dfe663e..0c63f26cf9 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.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 +http\://www.springframework.org/schema/integration/redis/spring-integration-redis-5.2.xsd=org/springframework/integration/redis/config/spring-integration-redis-5.2.xsd +http\://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd=org/springframework/integration/redis/config/spring-integration-redis-5.2.xsd diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.1.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.2.xsd similarity index 100% rename from spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.1.xsd rename to spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-5.2.xsd 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 3ba0ae2d83..c922df88c9 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.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 +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi-5.2.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-5.2.xsd +http\://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd=org/springframework/integration/rmi/config/spring-integration-rmi-5.2.xsd diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.1.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.2.xsd similarity index 100% rename from spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.1.xsd rename to spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-5.2.xsd 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 53525ab8d3..e4a0c1e267 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.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 +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd +http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.1.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd similarity index 100% rename from spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.1.xsd rename to spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.1.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd similarity index 100% rename from spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.1.xsd rename to spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.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 185e1a21bb..b0d67983ca 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.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 +http\://www.springframework.org/schema/integration/security/spring-integration-security-5.2.xsd=org/springframework/integration/security/config/spring-integration-security-5.2.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-5.2.xsd diff --git a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.1.xsd b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.2.xsd similarity index 100% rename from spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.1.xsd rename to spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.2.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 90a50e4e19..2ee5efe7b1 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.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 +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.2.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.2.xsd diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.2.xsd similarity index 100% rename from spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd rename to spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.2.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 7647e70e27..779c5cba69 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.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 +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.2.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.2.xsd +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.2.xsd diff --git a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.2.xsd similarity index 100% rename from spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd rename to spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.2.xsd 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 5bf4918cf0..063d09b397 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.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 +http\://www.springframework.org/schema/integration/stream/spring-integration-stream-5.2.xsd=org/springframework/integration/stream/config/spring-integration-stream-5.2.xsd +http\://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd=org/springframework/integration/stream/config/spring-integration-stream-5.2.xsd diff --git a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-5.1.xsd b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-5.2.xsd similarity index 100% rename from spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-5.1.xsd rename to spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-5.2.xsd 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 1e8eeb2e8d..fb6f815a4c 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.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 +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-5.2.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-5.2.xsd +http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-5.2.xsd diff --git a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.1.xsd b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.2.xsd similarity index 100% rename from spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.1.xsd rename to spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-5.2.xsd 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 4beab069bf..34f37daa8f 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.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 +http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux-5.2.xsd=org/springframework/integration/webflux/config/spring-integration-webflux-5.2.xsd +http\://www.springframework.org/schema/integration/webflux/spring-integration-webflux.xsd=org/springframework/integration/webflux/config/spring-integration-webflux-5.2.xsd diff --git a/spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.1.xsd b/spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.2.xsd similarity index 100% rename from spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.1.xsd rename to spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/spring-integration-webflux-5.2.xsd 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 19f300e05c..089bbf3771 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.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 +http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket-5.2.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-5.2.xsd +http\://www.springframework.org/schema/integration/websocket/spring-integration-websocket.xsd=org/springframework/integration/websocket/config/spring-integration-websocket-5.2.xsd diff --git a/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.1.xsd b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.2.xsd similarity index 100% rename from spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.1.xsd rename to spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-5.2.xsd 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 1d2dd6d94d..9cc9e4f21a 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.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 +http\://www.springframework.org/schema/integration/ws/spring-integration-ws-5.2.xsd=org/springframework/integration/ws/config/spring-integration-ws-5.2.xsd +http\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws-5.2.xsd diff --git a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.1.xsd b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.2.xsd similarity index 100% rename from spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.1.xsd rename to spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-5.2.xsd 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 9750243d8b..babcc8dcc7 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.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 +http\://www.springframework.org/schema/integration/xml/spring-integration-xml-5.2.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd +http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd diff --git a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.1.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd similarity index 100% rename from spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.1.xsd rename to spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-5.2.xsd 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 c612a349e4..f149c4df8a 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.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 +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-5.2.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-5.2.xsd +http\://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd=org/springframework/integration/xmpp/config/spring-integration-xmpp-5.2.xsd diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.1.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.2.xsd similarity index 100% rename from spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.1.xsd rename to spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-5.2.xsd 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 7c5064ccee..fcd3152bfb 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.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 +http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-5.2.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.2.xsd +http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.2.xsd diff --git a/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.1.xsd b/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.2.xsd similarity index 100% rename from spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.1.xsd rename to spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-5.2.xsd