Start version 5.1 with appropriate fixes

This commit is contained in:
Artem Bilan
2018-07-30 15:27:07 -04:00
parent d4f96b9ca5
commit c0f406dc5e
75 changed files with 340 additions and 317 deletions

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>advanced-testing-examples</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Advanced Testing Examples</name>
<description>Advanced Testing Examples</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>dynamic-ftp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Dynamic FTP Demo</name>
<description>Dynamic FTP Demo</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>dynamic-tcp-client</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Dynamic TCP Client</name>
<description>Dynamic TCP Client</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,21 +171,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -1,3 +1,19 @@
/*
* Copyright 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.dynamictcp;
import java.util.Collection;
@@ -15,7 +31,6 @@ import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.config.EnableMessageHistory;
import org.springframework.integration.dsl.IntegrationFlow;
import org.springframework.integration.dsl.context.IntegrationFlowContext;
import org.springframework.integration.dsl.context.IntegrationFlowRegistration;
import org.springframework.integration.ip.tcp.TcpReceivingChannelAdapter;
import org.springframework.integration.ip.tcp.TcpSendingMessageHandler;
import org.springframework.integration.ip.tcp.connection.TcpNetClientConnectionFactory;
@@ -132,7 +147,7 @@ public class DynamicTcpClientApplication {
TcpSendingMessageHandler handler = new TcpSendingMessageHandler();
handler.setConnectionFactory(cf);
IntegrationFlow flow = f -> f.handle(handler);
IntegrationFlowRegistration flowRegistration =
IntegrationFlowContext.IntegrationFlowRegistration flowRegistration =
this.flowContext.registration(flow)
.addBean(cf)
.id(hostPort + ".flow")

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>advanced</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<url>http://projects.spring.io/spring-integration</url>
<organization>
<name>SpringIO</name>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe-scripted</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Cafe Sample (Scripted Implementation)</name>
<description>Cafe Sample (Scripted Implementation)</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -175,7 +175,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -217,14 +217,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe-amqp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Cafe - With AMQP Message Broker</name>
<description>Cafe - With AMQP Message Broker</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe-si</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe-jms</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Cafe - With JMS Message Broker</name>
<description>Cafe - With JMS Message Broker</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe-si</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.15.2</version>
<version>5.15.3</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
<version>5.15.2</version>
<version>5.15.3</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -200,14 +200,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe-si</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Cafe - Pure Spring Integration</name>
<description>Cafe - Pure Spring Integration</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<url>http://projects.spring.io/spring-integration</url>
<organization>
<name>SpringIO</name>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>file-split-ftp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>File Split FTP</name>
<description>File Split FTP</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -167,7 +167,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -239,21 +239,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -26,6 +26,7 @@ import org.apache.commons.net.ftp.FTPFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.mail.MailProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.integration.dsl.IntegrationFlow;
@@ -138,6 +139,7 @@ public class Application {
}
@Bean
@ConditionalOnMissingBean
public SessionFactory<FTPFile> ftp1() {
DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory();
ftp.setHost("host3");
@@ -147,6 +149,7 @@ public class Application {
}
@Bean
@ConditionalOnMissingBean
public SessionFactory<FTPFile> ftp2() {
DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory();
ftp.setHost("host3");
@@ -156,6 +159,7 @@ public class Application {
}
@Bean
@ConditionalOnMissingBean
public SessionFactory<FTPFile> ftp3() {
DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory();
ftp.setHost("host3");

View File

@@ -56,7 +56,7 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
@SpringBootTest(classes = { ApplicationTests.Config.class, Application.class })
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
@SpringIntegrationTest(noAutoStartup = "fileInboundChannelAdapter")
public class ApplicationTests {
@@ -200,30 +200,30 @@ public class ApplicationTests {
public static class Config {
@Bean
public SessionFactory<FTPFile> ftp1() throws IOException {
public SessionFactory<FTPFile> ftp1() {
return mockSf();
}
@Bean
public SessionFactory<FTPFile> ftp2() throws IOException {
public SessionFactory<FTPFile> ftp2() {
return mockSf();
}
@Bean
public SessionFactory<FTPFile> ftp3() throws IOException {
public SessionFactory<FTPFile> ftp3() {
return mockSf();
}
private SessionFactory<FTPFile> mockSf() throws IOException {
private SessionFactory<FTPFile> mockSf() {
@SuppressWarnings("unchecked")
SessionFactory<FTPFile> mocksf = mock(SessionFactory.class);
given(mocksf.getSession()).willReturn(mockSession());
return mocksf;
}
@SuppressWarnings("unchecked")
@Bean
public Session<FTPFile> mockSession() throws IOException {
@SuppressWarnings("unchecked")
public Session<FTPFile> mockSession() {
return mock(Session.class);
}

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>loan-broker</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Loan Broker Sample</name>
<description>Loan Broker Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>loanshark</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Loan Shark Sample</name>
<description>Loan Shark Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>1.8.13</version>
<version>1.9.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -399,7 +399,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -441,14 +441,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>applications</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<url>http://projects.spring.io/spring-integration</url>
<organization>
<name>SpringIO</name>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stomp-chat</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Web Sockets Stomp Chat Sample</name>
<description>Web Sockets Stomp Chat Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -193,21 +193,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>amqp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>AMQP Basic Sample</name>
<description>AMQP Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>barrier</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Barrier Sample</name>
<description>Barrier Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -143,7 +143,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -204,21 +204,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>control-bus</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Control Bus Basic Sample</name>
<description>Control Bus Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>enricher</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Enricher Basic Sample</name>
<description>Enricher Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>feed</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Feed (RSS/ATOM) Basic Sample</name>
<description>Feed (RSS/ATOM) Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>file</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>File Copy Basic Sample</name>
<description>File Copy Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>ftp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>FTP Basic Sample</name>
<description>FTP Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -142,7 +142,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -207,14 +207,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>helloworld</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Hello World Sample</name>
<description>Hello World Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>http</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>HTTP Sample</name>
<description>HTTP Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -176,7 +176,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -218,14 +218,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>jdbc</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>JDBC Basic Sample</name>
<description>JDBC Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>jms</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>JMS Basic Sample</name>
<description>JMS Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.15.2</version>
<version>5.15.3</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
<version>5.15.2</version>
<version>5.15.3</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -157,7 +157,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -210,14 +210,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>jmx</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>JMX Basic Sample</name>
<description>JMX Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -159,14 +159,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>jpa</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>JPA Basic Sample</name>
<description>JPA Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -145,7 +145,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -206,21 +206,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>kafka</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Apache Kafka Sample</name>
<description>Apache Kafka Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-kafka</artifactId>
<version>3.0.3.RELEASE</version>
<version>3.1.0.M1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<version>2.1.8.RELEASE</version>
<version>2.2.0.M1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -211,21 +211,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -45,8 +45,8 @@ import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
import org.springframework.kafka.core.DefaultKafkaProducerFactory;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.kafka.core.ProducerFactory;
import org.springframework.kafka.listener.ContainerProperties;
import org.springframework.kafka.listener.KafkaMessageListenerContainer;
import org.springframework.kafka.listener.config.ContainerProperties;
import org.springframework.kafka.support.KafkaHeaders;
import org.springframework.kafka.support.KafkaNull;
import org.springframework.kafka.support.TopicPartitionInitialOffset;

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>mail</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Mail (IMAP + POP3) Sample</name>
<description>Mail (IMAP + POP3) Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -141,7 +141,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>mongodb</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>MongoDb Basic Sample</name>
<description>MongoDb Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>mqtt</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>MQTT Basic Sample</name>
<description>MQTT Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,21 +171,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>oddeven</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Odd-Even Sample</name>
<description>Odd-Even Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>basic</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<url>http://projects.spring.io/spring-integration</url>
<organization>
<name>SpringIO</name>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>quote</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Quote Sample</name>
<description>Quote Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>sftp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>SFTP Basic Sample</name>
<description>SFTP Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>splunk</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Splunk Sample</name>
<description>Splunk Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -183,21 +183,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>tcp-amqp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>TCP-AMQP Basic Sample</name>
<description>TCP-AMQP Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -141,7 +141,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>tcp-client-server</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>TCP Client Server Sample</name>
<description>TCP Client Server Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>testing-examples</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Testing Examples</name>
<description>Testing Examples</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -192,14 +192,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>twitter</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Twitter Basic Sample</name>
<description>Twitter Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -54,7 +54,8 @@
<dependencies>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-twitter</artifactId>
<artifactId>spring-integration-social-twitter</artifactId>
<version>1.0.0.M1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -106,7 +107,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +149,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>web-sockets</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Web Sockets Basic Sample</name>
<description>Web Sockets Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,21 +171,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>ws-inbound-gateway</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>WS Inbound Gateway Sample</name>
<description>WS Inbound Gateway Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -170,14 +170,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>ws-outbound-gateway</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>WS Outbound Gateway Sample</name>
<description>WS Outbound Gateway Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -159,14 +159,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>xml</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>XML Sample</name>
<description>XML Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>xmpp</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>XMPP Basic Sample</name>
<description>XMPP Basic Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -169,9 +169,9 @@ subprojects { subproject ->
}
ext {
activeMqVersion = '5.15.2'
activeMqVersion = '5.15.3'
apacheSshdVersion = '1.6.0'
aspectjVersion = '1.8.13'
aspectjVersion = '1.9.0'
commonsDigesterVersion = '2.0'
commonsDbcpVersion = '1.2.2'
commonsFileUploadVersion = '1.2.2'
@@ -205,18 +205,19 @@ subprojects { subproject ->
junitVersion = '4.12'
jythonVersion = '2.5.3'
log4jVersion = '2.7'
mockitoVersion = '2.10.0'
mockitoVersion = '2.18.0'
openJpaVersion = '2.4.0'
oracleDriverVersion = '11.2.0.3'
postgresVersion = '42.0.0'
subethasmtpVersion = '1.2'
slf4jVersion = '1.7.25'
springIntegrationVersion = '5.0.7.RELEASE'
springIntegrationKafkaVersion = '3.0.3.RELEASE'
springIntegrationVersion = '5.1.0.M1'
springIntegrationKafkaVersion = '3.1.0.M1'
springIntegrationSocialTwiterVersion = '1.0.0.M1'
springIntegrationSplunkVersion = '1.1.0.RELEASE'
springKafkaVersion = '2.1.8.RELEASE'
springVersion = '5.0.8.RELEASE'
springSecurityVersion = '5.0.6.RELEASE'
springKafkaVersion = '2.2.0.M1'
springVersion = '5.1.0.RC1'
springSecurityVersion = '5.1.0.M2'
springWebFlowVersion = '2.3.3.RELEASE'
tilesJspVersion = '2.2.1'
validationApiVersion = '1.0.0.GA'
@@ -688,7 +689,7 @@ project('si4demo') {
compile 'org.springframework.boot:spring-boot-starter-web'
compile 'org.springframework.boot:spring-boot-starter-integration'
compile "org.springframework.integration:spring-integration-mail"
compile "org.springframework.integration:spring-integration-twitter"
compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion"
compile "org.springframework.integration:spring-integration-http"
compile "org.springframework.integration:spring-integration-ip"
compile "javax.mail:javax.mail-api:$javaxMailVersion"
@@ -938,7 +939,7 @@ project('twitter') {
description = 'Twitter Basic Sample'
dependencies {
compile "org.springframework.integration:spring-integration-twitter"
compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion"
compile "org.apache.logging.log4j:log4j-core:$log4jVersion"
}
@@ -1078,7 +1079,7 @@ project('monitoring') {
dependencies {
compile "org.springframework.integration:spring-integration-jmx"
compile "org.springframework.integration:spring-integration-twitter"
compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion"
compile "org.springframework.integration:spring-integration-groovy"
compile "org.springframework:spring-webmvc"
compile "javax.servlet:jstl:$jstlVersion"

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe-dsl</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Java DSL Cafe Sample</name>
<description>Java DSL Cafe Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>cafe-si</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -195,21 +195,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>kafka-dsl</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Java DSL Kafka Sample</name>
<description>Java DSL Kafka Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-kafka</artifactId>
<version>3.0.3.RELEASE</version>
<version>3.1.0.M1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -195,21 +195,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>dsl</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<url>http://projects.spring.io/spring-integration</url>
<organization>
<name>SpringIO</name>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -123,14 +123,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>si4demo</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Java Configuration/DSL Sample</name>
<description>Java Configuration/DSL Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -92,7 +92,8 @@
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-twitter</artifactId>
<artifactId>spring-integration-social-twitter</artifactId>
<version>1.0.0.M1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -190,7 +191,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -251,21 +252,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

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

Binary file not shown.

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>async-gateway</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Async Gateway Sample</name>
<description>Async Gateway Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>dynamic-poller</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Dynamic Poller Sample</name>
<description>Dynamic Poller Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>errorhandling</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Error Handling Sample</name>
<description>Error Handling Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>file-processing</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>File Processing Sample</name>
<description>File Processing Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>mail-attachments</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Mail Attachment Sample</name>
<description>Mail Attachment Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -218,14 +218,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>monitoring</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Monitoring Application</name>
<description>Monitoring Application</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -65,7 +65,8 @@
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-twitter</artifactId>
<artifactId>spring-integration-social-twitter</artifactId>
<version>1.0.0.M1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -151,7 +152,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -193,14 +194,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>multipart-http</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>HTTP Multipart Demo</name>
<description>HTTP Multipart Demo</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -195,14 +195,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>intermediate</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<url>http://projects.spring.io/spring-integration</url>
<organization>
<name>SpringIO</name>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>rest-http</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Spring Integration Rest HTTP Path Usage Demo</name>
<description>Spring Integration Rest HTTP Path Usage Demo</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>5.0.6.RELEASE</version>
<version>5.1.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.0.6.RELEASE</version>
<version>5.1.0.M2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -220,7 +220,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -262,14 +262,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>retry-and-more</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Retry and More Sample</name>
<description>Retry and More Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -181,14 +181,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>splitter-aggregator-reaper</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Splitter-Aggregator-Reaper Sample</name>
<description>Splitter-Aggregator-Reaper Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stored-procedures-derby</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Derby Stored Procedures Sample</name>
<description>Derby Stored Procedures Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stored-procedures-ms</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>MS SQLServer Stored Procedures Sample</name>
<description>MS SQLServer Stored Procedures Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -172,14 +172,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stored-procedures-oracle</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Oracle Stored Procedures Sample</name>
<description>Oracle Stored Procedures Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stored-procedures-postgresql</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>PostgreSQL Stored Procedures Sample</name>
<description>PostgreSQL Stored Procedures Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -142,7 +142,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -184,14 +184,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>tcp-client-server-multiplex</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>TCP Client Server Multiplexing Sample</name>
<description>TCP Client Server Multiplexing Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -159,14 +159,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>travel</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Travel Services Sample</name>
<description>Travel Services Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -170,14 +170,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>tx-synch</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.1.0.BUILD-SNAPSHOT</version>
<name>Transaction Synchronization Sample</name>
<description>Transaction Synchronization Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>2.18.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.0.RC1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.7.RELEASE</version>
<version>5.1.0.M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>