Upgrade dependencies to the latest milestones

* Upgrade t Gradle 5.3.1
* Fix compatibility with `AbstractPayloadTransformer` contract
* Regenerate POMs
This commit is contained in:
Artem Bilan
2019-04-15 16:39:19 -04:00
parent 47ebbee8f3
commit 44218f26a0
67 changed files with 145 additions and 152 deletions

View File

@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -178,14 +178,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -217,14 +217,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -200,14 +200,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -246,14 +246,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -441,14 +441,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -200,14 +200,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -211,14 +211,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -207,14 +207,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -218,14 +218,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -210,14 +210,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -159,14 +159,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -213,14 +213,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -71,7 +71,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-kafka</artifactId>
<version>3.2.0.BUILD-SNAPSHOT</version>
<version>3.2.0.M1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<version>2.3.0.BUILD-SNAPSHOT</version>
<version>2.3.0.M1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -218,14 +218,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -200,14 +200,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -190,14 +190,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -189,14 +189,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -190,14 +190,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -192,14 +192,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -149,14 +149,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -178,14 +178,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -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<Iterator<String>>() {
@Override
public Message<Iterator<String>> receive() {
return new GenericMessage<Iterator<String>>(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<Object>("payload", null)));
new ExpressionEvaluatingHeaderValueMessageProcessor<>("payload", null)));
}
@Bean
@Transformer(inputChannel = "transformChannel", outputChannel = "sendTimeChannel")
public AbstractPayloadTransformer<?, ?> transformer() {
return new AbstractPayloadTransformer<Object, Object>() {
@Override
protected Object transformPayload(Object payload) throws Exception {
protected Object transformPayload(Object payload) {
return DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.DEFAULT).format(new Date());
}

View File

@@ -170,14 +170,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -159,14 +159,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -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'

View File

@@ -190,14 +190,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -82,7 +82,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-kafka</artifactId>
<version>3.2.0.BUILD-SNAPSHOT</version>
<version>3.2.0.M1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -202,14 +202,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -123,14 +123,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -259,14 +259,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -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

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -218,14 +218,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -194,14 +194,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -195,14 +195,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -144,7 +144,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>5.1.4.RELEASE</version>
<version>5.2.0.M2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>5.1.4.RELEASE</version>
<version>5.2.0.M2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -250,14 +250,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -181,14 +181,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -172,14 +172,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -184,14 +184,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -159,14 +159,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -170,14 +170,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.2.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>