diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index d57d257c..dd8e2cde 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index cfa0cc80..dc59ece5 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 4ebc8d07..d1c83b09 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples dynamic-tcp-client @@ -171,21 +171,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 40d90f26..ad382814 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -217,14 +217,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index edc53a23..a9180132 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index bf019600..ef78f97a 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 6b3c0509..6b0302ff 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 9d0e1197..fdc9d057 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples file-split-ftp @@ -239,21 +239,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java index 995e9c56..990ec1d0 100644 --- a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java +++ b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.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. @@ -33,7 +33,6 @@ import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.Pollers; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.file.FileWritingMessageHandler; -import org.springframework.integration.file.dsl.FileWritingMessageHandlerSpec; import org.springframework.integration.file.dsl.Files; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.file.splitter.FileSplitter; @@ -90,10 +89,11 @@ public class Application { } @Bean - public FileWritingMessageHandlerSpec fileOut() { + public FileWritingMessageHandler fileOut() { return Files.outboundAdapter("'/tmp/out'") .appendNewLine(true) - .fileNameExpression("payload.substring(1, 4) + '.txt'"); + .fileNameExpression("payload.substring(1, 4) + '.txt'") + .get(); } /** diff --git a/applications/file-split-ftp/src/main/resources/logback.xml b/applications/file-split-ftp/src/main/resources/logback.xml index bb023166..23ddeb50 100644 --- a/applications/file-split-ftp/src/main/resources/logback.xml +++ b/applications/file-split-ftp/src/main/resources/logback.xml @@ -12,6 +12,6 @@ - + diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 11ace1b6..0cfd2cdb 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 4a290ac1..3fda3e73 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -441,14 +441,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index d9ad989a..69905dab 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples stomp-chat @@ -193,21 +193,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 28c48b74..3038a3e4 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 3bd32705..8ef8551f 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples barrier @@ -204,21 +204,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 0edbfe32..b0767701 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 0fbf9d1b..5b0d4126 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 61158a0a..22946770 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 6f19b913..6e7b873f 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 7fccb4f2..7d6221ea 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -207,14 +207,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index baed35b0..df78b238 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index d509a766..867148a6 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 07d90ff8..052f0189 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 16d2453c..8fe4bb23 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index b79c91d4..179b82c4 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 97f16176..fda24108 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples jpa @@ -206,21 +206,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index cba52180..1573b3be 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples kafka @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.1.5.RELEASE + 2.1.7.RELEASE compile @@ -211,21 +211,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 0263b4b3..e7c359d9 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 3a08dc20..6d1a3f2b 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 858c6da4..f3512e12 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples mqtt @@ -171,21 +171,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index bdb99d2d..0f32be27 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index a5619e46..27cd442e 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 2b768835..85287973 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 8417fd60..87eb08e4 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples splunk @@ -183,21 +183,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 7b7229b2..91a2beda 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index f9d661ea..978e5c53 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index adf2fe9e..858bcf29 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -192,14 +192,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index e68f0dd1..26659b23 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 56ee5deb..f8aee653 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples web-sockets @@ -171,21 +171,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java index 3523309e..11476cc9 100644 --- a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java +++ b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-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. @@ -39,11 +39,12 @@ import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.samples.websocket.standard.server.Application; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.support.ChannelInterceptorAdapter; +import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author Artem Bilan + * @author Gary Russell * @since 3.0 */ @RunWith(SpringJUnit4ClassRunner.class) @@ -62,7 +63,8 @@ public class ApplicationTests { final CountDownLatch stopLatch = new CountDownLatch(2); - webSocketInputChannel.addInterceptor(new ChannelInterceptorAdapter() { + webSocketInputChannel.addInterceptor(new ChannelInterceptor() { + @Override public void postSend(Message message, MessageChannel channel, boolean sent) { Object payload = message.getPayload(); diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index b29db7c4..fbc00920 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 147dccf6..e50177dd 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index a720488d..872747cc 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 6cc2d267..7bf0a7cf 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/build.gradle b/build.gradle index fdbb9b20..3435ff23 100644 --- a/build.gradle +++ b/build.gradle @@ -211,12 +211,12 @@ subprojects { subproject -> postgresVersion = '42.0.0' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.0.5.RELEASE' + springIntegrationVersion = '5.0.6.RELEASE' springIntegrationKafkaVersion = '3.0.3.RELEASE' springIntegrationSplunkVersion = '1.1.0.RELEASE' - springKafkaVersion = '2.1.5.RELEASE' - springVersion = '5.0.5.RELEASE' - springSecurityVersion = '5.0.4.RELEASE' + springKafkaVersion = '2.1.7.RELEASE' + springVersion = '5.0.7.RELEASE' + springSecurityVersion = '5.0.6.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index ab6660f9..70af4060 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples cafe-dsl @@ -195,21 +195,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index cadd72cb..423a449d 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples kafka-dsl @@ -195,21 +195,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 8a1b2658..0c2d9507 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -123,14 +123,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 7f963a77..12693b4b 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.2.RELEASE + 2.0.3.RELEASE org.springframework.integration.samples si4demo @@ -251,21 +251,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.2.RELEASE + 2.0.3.RELEASE import pom org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/gradle.properties b/gradle.properties index a3fe0288..b66b6bd5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ version=5.0.0.BUILD-SNAPSHOT -springBootVersion=2.0.2.RELEASE +springBootVersion=2.0.3.RELEASE diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 6552664a..3f12ca85 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index a1a9d7a6..cb989bd0 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index feb306f7..48a18c28 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index cc8c3735..9d1c7013 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index b68e4d51..bc46e721 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 2973c578..2b2312b5 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -193,14 +193,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/monitoring/src/main/java/org/springintegration/NotificationListener.java b/intermediate/monitoring/src/main/java/org/springintegration/NotificationListener.java index bcde6951..b3331476 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/NotificationListener.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/NotificationListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 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. @@ -15,7 +15,7 @@ */ package org.springintegration; -import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; /** @@ -29,13 +29,15 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class NotificationListener { public static void main(String[] args) throws Exception { - ApplicationContext ctx = new ClassPathXmlApplicationContext("classpath:/META-INF/spring/integration/remote-monitor-context.xml"); + ConfigurableApplicationContext ctx = + new ClassPathXmlApplicationContext("classpath:/META-INF/spring/integration/remote-monitor-context.xml"); Gateway gw = ctx.getBean(Gateway.class); int cmd = 0; while (cmd != 'q') { cmd = System.in.read(); gw.send((char) cmd); } + ctx.close(); } public static interface Gateway { diff --git a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java index 76bc2054..591e4cda 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 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. @@ -23,7 +23,7 @@ import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.support.ChannelInterceptorAdapter; +import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.util.StopWatch; /** @@ -35,7 +35,7 @@ import org.springframework.util.StopWatch; * */ @ManagedResource -public class PayloadAwareTimingInterceptor extends ChannelInterceptorAdapter { +public class PayloadAwareTimingInterceptor implements ChannelInterceptor { private final ThreadLocal stopWatchHolder = new ThreadLocal(); @@ -60,7 +60,7 @@ public class PayloadAwareTimingInterceptor extends ChannelInterceptorAdapter { StopWatch stopWatch = new StopWatch(); stopWatch.start(); this.stopWatchHolder.set(new StopWatchHolder(stopWatch, message.getPayload().getClass())); - return super.preSend(message, channel); + return message; } @Override diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index f0c7acb0..c2b03354 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 31b67651..68db59d2 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -144,7 +144,7 @@ org.springframework.security spring-security-web - 5.0.4.RELEASE + 5.0.6.RELEASE compile @@ -156,7 +156,7 @@ org.springframework.security spring-security-config - 5.0.4.RELEASE + 5.0.6.RELEASE compile @@ -262,14 +262,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index b727e617..9e5548d4 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index bf6f933b..b9bae276 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index b9149906..326053a8 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 6c503c66..e67ef599 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -172,14 +172,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 0117abf5..20f2f65d 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 31c9dbc3..5b3d7903 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -184,14 +184,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index f26042e8..35769bc7 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index a73583bf..baa49c94 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 3d4a5915..83e90091 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.0.5.RELEASE + 5.0.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.0.5.RELEASE + 5.0.6.RELEASE import pom