diff --git a/gradle.properties b/gradle.properties index 9a389ba7fe..c64fcd0ed0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=4.2.3.BUILD-SNAPSHOT +version=4.3.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 f14910ecc6..38a275b7c9 100644 --- a/spring-integration-amqp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-amqp/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.2.xsd -http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.2.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.3.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd +http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.2.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd similarity index 99% rename from spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.2.xsd rename to spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd index ce1a8b9447..b08d3033cc 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.2.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd @@ -9,7 +9,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.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 80201e5642..efe0728900 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java @@ -44,7 +44,7 @@ public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHa protected final Log logger = LogFactory.getLog(this.getClass()); - private static final String VERSION = "4.2"; + private static final String VERSION = "4.3"; private final NamespaceHandlerDelegate delegate = new NamespaceHandlerDelegate(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/LifecycleMessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/core/LifecycleMessageSource.java deleted file mode 100644 index ab6233b1d0..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/LifecycleMessageSource.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2014 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.core; - -import org.springframework.context.Lifecycle; - -/** - * The {@link Lifecycle} marker interface for backward compatibility. - * Will be deprecated in 4.2 and removed in the future releases. - * - * @author Artem Bilan - * @since 4.0.6 - * @deprecated since 4.2 in favor of direct {@link Lifecycle} usage. - */ -@Deprecated -public interface LifecycleMessageSource extends MessageSource, Lifecycle { -} 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 50345a8fb2..d3ad83e1fe 100644 --- a/spring-integration-core/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-core/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/spring-integration-4.2.xsd=org/springframework/integration/config/xml/spring-integration-4.2.xsd -http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-4.2.xsd +http\://www.springframework.org/schema/integration/spring-integration-4.3.xsd=org/springframework/integration/config/xml/spring-integration-4.3.xsd +http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-4.3.xsd diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.2.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.3.xsd similarity index 100% rename from spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.2.xsd rename to spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.3.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 06f7e5e69c..10914c78bd 100644 --- a/spring-integration-event/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-event/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/event/spring-integration-event-4.2.xsd=org/springframework/integration/event/config/spring-integration-event-4.2.xsd -http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-4.2.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event-4.3.xsd=org/springframework/integration/event/config/spring-integration-event-4.3.xsd +http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-4.3.xsd diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.2.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.3.xsd similarity index 99% rename from spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.2.xsd rename to spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.3.xsd index 1a6d5cca23..7d219764d0 100644 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.2.xsd +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.3.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.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 6275228570..2eab28d075 100644 --- a/spring-integration-file/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-file/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/file/spring-integration-file-4.2.xsd=org/springframework/integration/file/config/spring-integration-file-4.2.xsd -http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-4.2.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file-4.3.xsd=org/springframework/integration/file/config/spring-integration-file-4.3.xsd +http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-4.3.xsd diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.2.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.3.xsd similarity index 99% rename from spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.2.xsd rename to spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.3.xsd index 6a7069afcf..b611a1cb47 100644 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.2.xsd +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.3.xsd @@ -10,7 +10,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.3.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 9b0fa9a821..21fc579a93 100644 --- a/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-gemfire/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.2.xsd -http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.2.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.3.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd +http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.2.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd similarity index 99% rename from spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.2.xsd rename to spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd index ea670e9fcf..d5ff36483e 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.2.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd @@ -10,7 +10,7 @@ schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.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 a166df358d..79642c6bb6 100644 --- a/spring-integration-http/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-http/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/http/spring-integration-http-4.2.xsd=org/springframework/integration/http/config/spring-integration-http-4.2.xsd -http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-4.2.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http-4.3.xsd=org/springframework/integration/http/config/spring-integration-http-4.3.xsd +http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-4.3.xsd diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.2.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.3.xsd similarity index 99% rename from spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.2.xsd rename to spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.3.xsd index 8236d85c2f..f103468725 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.2.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.3.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.3.xsd" /> diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.2.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.3.xsd similarity index 99% rename from spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.2.xsd rename to spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.3.xsd index f6bf924743..3bc91263b6 100644 --- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.2.xsd +++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.3.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.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 05c4ad1546..42acf6127d 100644 --- a/spring-integration-security/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-security/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/security/spring-integration-security-4.2.xsd=org/springframework/integration/security/config/spring-integration-security-4.2.xsd -http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-4.2.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security-4.3.xsd=org/springframework/integration/security/config/spring-integration-security-4.3.xsd +http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-4.3.xsd diff --git a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-4.2.xsd b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-4.3.xsd similarity index 100% rename from spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-4.2.xsd rename to spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-4.3.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 c6ca16294f..3b4d75267a 100644 --- a/spring-integration-sftp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-sftp/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.2.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-4.2.xsd -http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-4.2.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp-4.3.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd +http\://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd=org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.2.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd similarity index 99% rename from spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.2.xsd rename to spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd index 33d6efcd8e..22813c3bc3 100644 --- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.2.xsd +++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd @@ -10,9 +10,9 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.3.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 fb6d6a33a8..c23412eb83 100644 --- a/spring-integration-stomp/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-stomp/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-4.2.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-4.2.xsd -http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-4.2.xsd +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp-4.3.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd +http\://www.springframework.org/schema/integration/stomp/spring-integration-stomp.xsd=org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd diff --git a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.2.xsd b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd similarity index 99% rename from spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.2.xsd rename to spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd index af517fd77b..60692cb417 100644 --- a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.2.xsd +++ b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd @@ -10,7 +10,7 @@ + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd"/> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-4.3.xsd" /> + schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.3.xsd"/>