From 027021d6e4e6c26d396a3cd6f899d0b28d6edeb5 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 16 Mar 2018 21:38:02 -0400 Subject: [PATCH] Move XSDs to version 5.1 * Upgrade to Spring AMQP-2.1 and fix compatibility --- build.gradle | 4 ++-- .../amqp/inbound/AmqpInboundChannelAdapter.java | 4 ++-- .../integration/amqp/inbound/AmqpInboundGateway.java | 4 ++-- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-amqp-5.0.xsd => spring-integration-amqp-5.1.xsd} | 2 +- .../amqp/config/AmqpInboundChannelAdapterParserTests.java | 5 +++-- .../amqp/config/AmqpInboundGatewayParserTests.java | 4 ++-- .../integration/amqp/inbound/InboundEndpointTests.java | 5 +++-- .../config/xml/AbstractIntegrationNamespaceHandler.java | 4 ++-- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ing-integration-5.0.xsd => spring-integration-5.1.xsd} | 0 .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ion-event-5.0.xsd => spring-integration-event-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-feed-5.0.xsd => spring-integration-feed-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-file-5.0.xsd => spring-integration-file-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-ftp-5.0.xsd => spring-integration-ftp-5.1.xsd} | 4 ++-- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gemfire-5.0.xsd => spring-integration-gemfire-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...n-groovy-5.0.xsd => spring-integration-groovy-5.1.xsd} | 4 ++-- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-http-5.0.xsd => spring-integration-http-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...tegration-ip-5.0.xsd => spring-integration-ip-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-jdbc-5.0.xsd => spring-integration-jdbc-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-jms-5.0.xsd => spring-integration-jms-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-jmx-5.0.xsd => spring-integration-jmx-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-jpa-5.0.xsd => spring-integration-jpa-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-mail-5.0.xsd => spring-integration-mail-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...mongodb-5.0.xsd => spring-integration-mongodb-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-mqtt-5.0.xsd => spring-integration-mqtt-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ion-redis-5.0.xsd => spring-integration-redis-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-rmi-5.0.xsd => spring-integration-rmi-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 8 ++++---- ...pting-5.0.xsd => spring-integration-scripting-5.1.xsd} | 2 +- ...-5.0.xsd => spring-integration-scripting-core-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...curity-5.0.xsd => spring-integration-security-5.1.xsd} | 0 .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-sftp-5.0.xsd => spring-integration-sftp-5.1.xsd} | 4 ++-- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ion-stomp-5.0.xsd => spring-integration-stomp-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...n-stream-5.0.xsd => spring-integration-stream-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...n-syslog-5.0.xsd => spring-integration-syslog-5.1.xsd} | 4 ++-- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...twitter-5.0.xsd => spring-integration-twitter-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...webflux-5.0.xsd => spring-integration-webflux-5.1.xsd} | 4 ++-- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ocket-5.0.xsd => spring-integration-websocket-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...tegration-ws-5.0.xsd => spring-integration-ws-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...gration-xml-5.0.xsd => spring-integration-xml-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...ation-xmpp-5.0.xsd => spring-integration-xmpp-5.1.xsd} | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...eeper-5.0.xsd => spring-integration-zookeeper-5.1.xsd} | 2 +- 72 files changed, 118 insertions(+), 116 deletions(-) rename spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/{spring-integration-amqp-5.0.xsd => spring-integration-amqp-5.1.xsd} (99%) rename spring-integration-core/src/main/resources/org/springframework/integration/config/{spring-integration-5.0.xsd => spring-integration-5.1.xsd} (100%) rename spring-integration-event/src/main/resources/org/springframework/integration/event/config/{spring-integration-event-5.0.xsd => spring-integration-event-5.1.xsd} (99%) rename spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/{spring-integration-feed-5.0.xsd => spring-integration-feed-5.1.xsd} (99%) rename spring-integration-file/src/main/resources/org/springframework/integration/file/config/{spring-integration-file-5.0.xsd => spring-integration-file-5.1.xsd} (99%) rename spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/{spring-integration-ftp-5.0.xsd => spring-integration-ftp-5.1.xsd} (99%) rename spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/{spring-integration-gemfire-5.0.xsd => spring-integration-gemfire-5.1.xsd} (99%) rename spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/{spring-integration-groovy-5.0.xsd => spring-integration-groovy-5.1.xsd} (97%) rename spring-integration-http/src/main/resources/org/springframework/integration/http/config/{spring-integration-http-5.0.xsd => spring-integration-http-5.1.xsd} (99%) rename spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/{spring-integration-ip-5.0.xsd => spring-integration-ip-5.1.xsd} (99%) rename spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/{spring-integration-jdbc-5.0.xsd => spring-integration-jdbc-5.1.xsd} (99%) rename spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/{spring-integration-jms-5.0.xsd => spring-integration-jms-5.1.xsd} (99%) rename spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/{spring-integration-jmx-5.0.xsd => spring-integration-jmx-5.1.xsd} (99%) rename spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/{spring-integration-jpa-5.0.xsd => spring-integration-jpa-5.1.xsd} (99%) rename spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/{spring-integration-mail-5.0.xsd => spring-integration-mail-5.1.xsd} (99%) rename spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/{spring-integration-mongodb-5.0.xsd => spring-integration-mongodb-5.1.xsd} (99%) rename spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/{spring-integration-mqtt-5.0.xsd => spring-integration-mqtt-5.1.xsd} (99%) rename spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/{spring-integration-redis-5.0.xsd => spring-integration-redis-5.1.xsd} (99%) rename spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/{spring-integration-rmi-5.0.xsd => spring-integration-rmi-5.1.xsd} (99%) rename spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/{spring-integration-scripting-5.0.xsd => spring-integration-scripting-5.1.xsd} (96%) rename spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/{spring-integration-scripting-core-5.0.xsd => spring-integration-scripting-core-5.1.xsd} (99%) rename spring-integration-security/src/main/resources/org/springframework/integration/security/config/{spring-integration-security-5.0.xsd => spring-integration-security-5.1.xsd} (100%) rename spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/{spring-integration-sftp-5.0.xsd => spring-integration-sftp-5.1.xsd} (99%) rename spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/{spring-integration-stomp-5.0.xsd => spring-integration-stomp-5.1.xsd} (99%) rename spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/{spring-integration-stream-5.0.xsd => spring-integration-stream-5.1.xsd} (98%) rename spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/{spring-integration-syslog-5.0.xsd => spring-integration-syslog-5.1.xsd} (98%) rename spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/{spring-integration-twitter-5.0.xsd => spring-integration-twitter-5.1.xsd} (99%) rename spring-integration-webflux/src/main/resources/org/springframework/integration/webflux/config/{spring-integration-webflux-5.0.xsd => spring-integration-webflux-5.1.xsd} (99%) rename spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/{spring-integration-websocket-5.0.xsd => spring-integration-websocket-5.1.xsd} (99%) rename spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/{spring-integration-ws-5.0.xsd => spring-integration-ws-5.1.xsd} (99%) rename spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/{spring-integration-xml-5.0.xsd => spring-integration-xml-5.1.xsd} (99%) rename spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/{spring-integration-xmpp-5.0.xsd => spring-integration-xmpp-5.1.xsd} (99%) rename spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/{spring-integration-zookeeper-5.0.xsd => spring-integration-zookeeper-5.1.xsd} (98%) diff --git a/build.gradle b/build.gradle index 65421103a1..dea6820415 100644 --- a/build.gradle +++ b/build.gradle @@ -133,7 +133,7 @@ subprojects { subproject -> romeToolsVersion = '1.8.0' servletApiVersion = '4.0.0' smackVersion = '4.2.2' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.2.RELEASE' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.0.BUILD-SNAPSHOT' springDataJpaVersion = '2.1.0.BUILD-SNAPSHOT' springDataMongoVersion = '2.1.0.BUILD-SNAPSHOT' springDataRedisVersion = '2.1.0.BUILD-SNAPSHOT' @@ -142,7 +142,7 @@ subprojects { subproject -> springSocialTwitterVersion = '1.1.2.RELEASE' springRetryVersion = '1.2.2.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.4.RELEASE' - springWsVersion = '3.0.0.RELEASE' + springWsVersion = '3.0.1.RELEASE' tomcatVersion = "8.5.23" xmlUnitVersion = '1.6' xstreamVersion = '1.4.10' diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java index e5759eeb68..a46de7fb69 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.springframework.amqp.core.AcknowledgeMode; import org.springframework.amqp.core.Message; -import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener; import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer; +import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener; import org.springframework.amqp.rabbit.listener.exception.ListenerExecutionFailedException; import org.springframework.amqp.support.AmqpHeaders; import org.springframework.amqp.support.converter.MessageConverter; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java index 629f538c83..b7e33b1804 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,9 +25,9 @@ import org.springframework.amqp.core.AmqpTemplate; import org.springframework.amqp.core.Message; import org.springframework.amqp.core.MessagePostProcessor; import org.springframework.amqp.core.MessageProperties; -import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer; +import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener; import org.springframework.amqp.rabbit.listener.exception.ListenerExecutionFailedException; import org.springframework.amqp.support.AmqpHeaders; import org.springframework.amqp.support.converter.MessageConverter; diff --git a/spring-integration-amqp/src/main/resources/META-INF/spring.schemas b/spring-integration-amqp/src/main/resources/META-INF/spring.schemas index f60ef6be4b..ed748d7290 100644 --- a/spring-integration-amqp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-amqp/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd similarity index 99% rename from spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd rename to spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd index 3423339107..1b2ce7f920 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.0.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd @@ -9,7 +9,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/> diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java index c852b2ebcc..67a23f8b40 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,10 +30,10 @@ import org.junit.runner.RunWith; import org.springframework.amqp.core.AcknowledgeMode; import org.springframework.amqp.core.Message; import org.springframework.amqp.core.MessageProperties; -import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener; import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer; import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer; import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer; +import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener; import org.springframework.amqp.support.AmqpHeaders; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; @@ -51,6 +51,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @author Mark Fisher * @author Artem Bilan * @author Gary Russell + * * @since 2.1 */ @ContextConfiguration diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java index abda7fbe6b..74c68d91cf 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,9 +31,9 @@ import org.mockito.Mockito; import org.springframework.amqp.core.Address; import org.springframework.amqp.core.Message; import org.springframework.amqp.core.MessageProperties; -import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer; +import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener; import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.amqp.support.converter.SimpleMessageConverter; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java index e09d249a52..4efd3389d6 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2017 the original author or authors. + * Copyright 2013-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,10 +48,10 @@ import org.springframework.amqp.core.AcknowledgeMode; import org.springframework.amqp.core.MessageProperties; import org.springframework.amqp.rabbit.connection.Connection; import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer; import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer; +import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener; import org.springframework.amqp.support.AmqpHeaders; import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; import org.springframework.amqp.support.converter.MessageConversionException; @@ -81,6 +81,7 @@ import com.rabbitmq.client.Channel; /** * @author Artem Bilan * @author Gary Russell + * * @since 3.0 */ public class InboundEndpointTests { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java index 8633168fcf..98dee457a7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.springframework.util.StringUtils; */ public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHandler { - private static final String VERSION = "5.0"; + private static final String VERSION = "5.1"; protected final Log logger = LogFactory.getLog(this.getClass()); diff --git a/spring-integration-core/src/main/resources/META-INF/spring.schemas b/spring-integration-core/src/main/resources/META-INF/spring.schemas index e234cb04e3..c102570d9a 100644 --- a/spring-integration-core/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-core/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/spring-integration-5.0.xsd=org/springframework/integration/config/spring-integration-5.0.xsd -http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/spring-integration-5.0.xsd +http\://www.springframework.org/schema/integration/spring-integration-5.1.xsd=org/springframework/integration/config/spring-integration-5.1.xsd +http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/spring-integration-5.1.xsd diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.1.xsd similarity index 100% rename from spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.0.xsd rename to spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-5.1.xsd diff --git a/spring-integration-event/src/main/resources/META-INF/spring.schemas b/spring-integration-event/src/main/resources/META-INF/spring.schemas index c82ead7a5a..ada3f7ab52 100644 --- a/spring-integration-event/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-event/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/event/spring-integration-event-5.0.xsd=org/springframework/integration/event/config/spring-integration-event-5.0.xsd -http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-5.0.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-5.1.xsd=org/springframework/integration/event/config/spring-integration-event-5.1.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-5.1.xsd diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.0.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.1.xsd similarity index 99% rename from spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.0.xsd rename to spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.1.xsd index e8c2375dfa..ee50ce9886 100644 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.0.xsd +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.1.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.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 bf02e4bdb5..3c149fcc14 100644 --- a/spring-integration-file/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-file/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/file/spring-integration-file-5.0.xsd=org/springframework/integration/file/config/spring-integration-file-5.0.xsd -http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-5.0.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-5.1.xsd=org/springframework/integration/file/config/spring-integration-file-5.1.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-5.1.xsd diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.0.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd similarity index 99% rename from spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.0.xsd rename to spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd index c11f885e21..d6f489639a 100644 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.0.xsd +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd @@ -10,7 +10,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-5.1.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 1694ebee78..0d307e22a5 100644 --- a/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-5.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd similarity index 99% rename from spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd rename to spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd index a797b3e872..8203f9a326 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.0.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd @@ -10,7 +10,7 @@ schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.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 86bf9752b2..28418d3ac0 100644 --- a/spring-integration-http/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-http/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/http/spring-integration-http-5.0.xsd=org/springframework/integration/http/config/spring-integration-http-5.0.xsd -http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-5.0.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-5.1.xsd=org/springframework/integration/http/config/spring-integration-http-5.1.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-5.1.xsd diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.0.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd similarity index 99% rename from spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.0.xsd rename to spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd index aaf741049c..92078dc4a8 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.0.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.1.xsd" /> diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.0.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.1.xsd similarity index 99% rename from spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.0.xsd rename to spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.1.xsd index 4c3817199a..90fc3e8ee4 100644 --- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.0.xsd +++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-5.1.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.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 e485bb4181..185e1a21bb 100644 --- a/spring-integration-security/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-security/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/security/spring-integration-security-5.0.xsd=org/springframework/integration/security/config/spring-integration-security-5.0.xsd -http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-5.0.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-5.1.xsd=org/springframework/integration/security/config/spring-integration-security-5.1.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-5.1.xsd diff --git a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.0.xsd b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.1.xsd similarity index 100% rename from spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.0.xsd rename to spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-5.1.xsd diff --git a/spring-integration-sftp/src/main/resources/META-INF/spring.schemas b/spring-integration-sftp/src/main/resources/META-INF/spring.schemas index 30b9dabf7e..90a50e4e19 100644 --- a/spring-integration-sftp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-sftp/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.0.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-5.1.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd similarity index 99% rename from spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd rename to spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd index ba5265367b..e334feb82f 100644 --- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.0.xsd +++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-5.1.xsd @@ -10,9 +10,9 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-5.1.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 11e8dc8ba9..7647e70e27 100644 --- a/spring-integration-stomp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-stomp/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.0.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd -http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-5.1.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd diff --git a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd similarity index 99% rename from spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd rename to spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd index b5f0025673..f62e6c13cc 100644 --- a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.0.xsd +++ b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-5.1.xsd @@ -10,7 +10,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-5.1.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/>