diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index e73a8752..50a19617 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 93695e13..25731cab 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 159a9593..eaca4203 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 4dab7cdd..1c2f4e5b 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -217,14 +217,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index a4f110c9..dd9ee655 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 5a34908e..a6213c82 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index df37adf2..a52f212e 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 48f505cc..dc2f037e 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -246,14 +246,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 034b01c9..48d87430 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 5a2e5df5..b907381f 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -441,14 +441,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index e354f9fd..1eaa3044 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 550aeb73..5c5a2724 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 6205aa90..796c5b51 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 6f0a2177..5ffa5666 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 99e0d21f..433edccd 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 2164331f..0a10efa5 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 69c508f8..9b58b808 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 1d964c0b..0e45652b 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -207,14 +207,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 21752079..566cbe3c 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index ce181ace..72fdebaf 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index cf150f7e..29e20d79 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 79971abc..e229a15d 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index f499a055..d633e8ab 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index ad652342..ab4d649e 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -213,14 +213,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index a09383a6..6ec03f18 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.BUILD-SNAPSHOT + 3.2.0.M1 compile @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.3.0.BUILD-SNAPSHOT + 2.3.0.M1 compile @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 8f1a685c..e96e7e78 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index a1c2b868..acea9836 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 0384ece0..7ad1f077 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 0b05170e..b30d37e9 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index f5a63ef5..0611582c 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 67478e77..9d98e76a 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index d54ab4bb..0bf659ff 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 7c371250..691e786d 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 072b2c04..d7199e8e 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index a2aa549a..70cdca17 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 65cf6382..42c2f2ba 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 47d6e10c..a46bcb00 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -192,14 +192,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index e919a908..8471a8ce 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -149,14 +149,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 8b3421e7..aed2ba96 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java index df8189f2..f5c6e96d 100644 --- a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java +++ b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ package org.springframework.integration.samples.websocket.standard.server; import java.text.DateFormat; import java.util.Collections; import java.util.Date; -import java.util.Iterator; import java.util.concurrent.Executors; import org.springframework.boot.SpringApplication; @@ -42,7 +41,6 @@ import org.springframework.integration.transformer.HeaderEnricher; import org.springframework.integration.transformer.support.ExpressionEvaluatingHeaderValueMessageProcessor; import org.springframework.integration.websocket.ServerWebSocketContainer; import org.springframework.integration.websocket.outbound.WebSocketOutboundMessageHandler; -import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.simp.SimpMessageHeaderAccessor; @@ -50,6 +48,7 @@ import org.springframework.messaging.support.GenericMessage; /** * @author Artem Bilan + * * @since 3.0 */ @Configuration @@ -71,14 +70,7 @@ public class Application { @Bean @InboundChannelAdapter(value = "splitChannel", poller = @Poller(fixedDelay = "1000", maxMessagesPerPoll = "1")) public MessageSource webSocketSessionsMessageSource() { - return new MessageSource>() { - - @Override - public Message> receive() { - return new GenericMessage>(serverWebSocketContainer().getSessions().keySet().iterator()); - } - - }; + return () -> new GenericMessage<>(serverWebSocketContainer().getSessions().keySet().iterator()); } @Bean @@ -103,15 +95,16 @@ public class Application { @Transformer(inputChannel = "headerEnricherChannel", outputChannel = "transformChannel") public HeaderEnricher headerEnricher() { return new HeaderEnricher(Collections.singletonMap(SimpMessageHeaderAccessor.SESSION_ID_HEADER, - new ExpressionEvaluatingHeaderValueMessageProcessor("payload", null))); + new ExpressionEvaluatingHeaderValueMessageProcessor<>("payload", null))); } @Bean @Transformer(inputChannel = "transformChannel", outputChannel = "sendTimeChannel") public AbstractPayloadTransformer transformer() { return new AbstractPayloadTransformer() { + @Override - protected Object transformPayload(Object payload) throws Exception { + protected Object transformPayload(Object payload) { return DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.DEFAULT).format(new Date()); } diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 7c560184..0bfd93de 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index dbb76f93..402a01ba 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index c02b8bdb..f33c99ee 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index b3d3fa00..b31e1978 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/build.gradle b/build.gradle index bfc89560..9b98a18a 100644 --- a/build.gradle +++ b/build.gradle @@ -208,13 +208,13 @@ subprojects { subproject -> postgresVersion = '42.2.5' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.2.0.BUILD-SNAPSHOT' - springIntegrationKafkaVersion = '3.2.0.BUILD-SNAPSHOT' + springIntegrationVersion = '5.2.0.M1' + springIntegrationKafkaVersion = '3.2.0.M1' springIntegrationSocialTwiterVersion = '1.0.0.RELEASE' springIntegrationSplunkVersion = '1.1.0.RELEASE' - springKafkaVersion = '2.3.0.BUILD-SNAPSHOT' - springVersion = '5.2.0.BUILD-SNAPSHOT' - springSecurityVersion = '5.1.4.RELEASE' + springKafkaVersion = '2.3.0.M1' + springVersion = '5.2.0.M1' + springSecurityVersion = '5.2.0.M2' 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 8cc0294a..e55dbf96 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 203c19e7..af105776 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -82,7 +82,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.BUILD-SNAPSHOT + 3.2.0.M1 compile @@ -202,14 +202,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index ed470c57..3fca30e2 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -123,14 +123,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 42a81dbc..ffbb19ca 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -259,14 +259,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 838e6bc8..ea13fdfd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index b1c2d34b..12668944 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 89a118d0..82e77dab 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 1b361238..7d02e0d3 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 7f1a89ae..6093e86b 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 1b14320e..51f64847 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 9fcafb7e..4f653647 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 7947d270..d7c96a03 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index a30bc1f1..96ecf9d9 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -144,7 +144,7 @@ org.springframework.security spring-security-web - 5.1.4.RELEASE + 5.2.0.M2 compile @@ -156,7 +156,7 @@ org.springframework.security spring-security-config - 5.1.4.RELEASE + 5.2.0.M2 compile @@ -250,14 +250,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 56affeea..61750ed7 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 6f66ef77..5abfb521 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index b3686af8..e1545199 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 4a7898d5..6f5d6b74 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 0ce9c3be..2a7dcfd5 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 91b8f092..4fb3d76f 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 9ecc4c6a..c6b5e56d 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.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index b4450f12..196ff450 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index ed71e347..7eb3751d 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom