Upgrade Spring Dependencies

This commit is contained in:
Gary Russell
2018-07-12 14:11:38 -04:00
parent 4dd28d0009
commit 41664f0501
69 changed files with 175 additions and 171 deletions

View File

@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>dynamic-tcp-client</artifactId>
@@ -171,21 +171,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>file-split-ftp</artifactId>
@@ -239,21 +239,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -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();
}
/**

View File

@@ -12,6 +12,6 @@
<root level="warn">
<appender-ref ref="STDOUT" />
</root>
<logger name="org.springframework.integration" level="info" />
<logger name="org.springframework.integration" level="debug" />
</configuration>

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stomp-chat</artifactId>
@@ -193,21 +193,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>barrier</artifactId>
@@ -204,21 +204,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>jpa</artifactId>
@@ -206,21 +206,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>kafka</artifactId>
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<version>2.1.5.RELEASE</version>
<version>2.1.7.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -211,21 +211,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>mqtt</artifactId>
@@ -171,21 +171,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>splunk</artifactId>
@@ -183,21 +183,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>web-sockets</artifactId>
@@ -171,21 +171,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -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();

View File

@@ -170,14 +170,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe-dsl</artifactId>
@@ -195,21 +195,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>kafka-dsl</artifactId>
@@ -195,21 +195,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>si4demo</artifactId>
@@ -251,21 +251,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -1,2 +1,2 @@
version=5.0.0.BUILD-SNAPSHOT
springBootVersion=2.0.2.RELEASE
springBootVersion=2.0.3.RELEASE

View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -193,14 +193,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

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

View File

@@ -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> stopWatchHolder = new ThreadLocal<PayloadAwareTimingInterceptor.StopWatchHolder>();
@@ -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

View File

@@ -195,14 +195,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.4.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>5.0.4.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -262,14 +262,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</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.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>