diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 91721c29..2186efac 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Advanced Testing Examples Advanced Testing Examples http://projects.spring.io/spring-integration @@ -129,7 +129,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 98967e64..76d452a1 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Dynamic FTP Demo Dynamic FTP Demo http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index b3efa34c..e82dc840 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples dynamic-tcp-client - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Dynamic TCP Client Dynamic TCP Client http://projects.spring.io/spring-integration @@ -110,7 +110,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -171,21 +171,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/advanced/dynamic-tcp-client/src/main/java/org/springframework/integration/samples/dynamictcp/DynamicTcpClientApplication.java b/advanced/dynamic-tcp-client/src/main/java/org/springframework/integration/samples/dynamictcp/DynamicTcpClientApplication.java index 640fa079..fd6ef7b8 100644 --- a/advanced/dynamic-tcp-client/src/main/java/org/springframework/integration/samples/dynamictcp/DynamicTcpClientApplication.java +++ b/advanced/dynamic-tcp-client/src/main/java/org/springframework/integration/samples/dynamictcp/DynamicTcpClientApplication.java @@ -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") diff --git a/advanced/pom.xml b/advanced/pom.xml index 019d35f5..5974c55a 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index faf1a16a..dd40737f 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Cafe Sample (Scripted Implementation) Cafe Sample (Scripted Implementation) http://projects.spring.io/spring-integration @@ -175,7 +175,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -217,14 +217,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index a73caa26..1b06c1db 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Cafe - With AMQP Message Broker Cafe - With AMQP Message Broker http://projects.spring.io/spring-integration @@ -55,7 +55,7 @@ org.springframework.integration.samples cafe-si - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT compile @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 761cedff..1cd3ee61 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Cafe - With JMS Message Broker Cafe - With JMS Message Broker http://projects.spring.io/spring-integration @@ -55,7 +55,7 @@ org.springframework.integration.samples cafe-si - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT compile @@ -67,7 +67,7 @@ org.apache.activemq activemq-broker - 5.15.2 + 5.15.3 compile @@ -79,7 +79,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.2 + 5.15.3 compile @@ -158,7 +158,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 36ccd6bb..d27ea1c0 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Cafe - Pure Spring Integration Cafe - Pure Spring Integration http://projects.spring.io/spring-integration @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 21326edd..1f264d4a 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 1c6c41d8..b23a56a3 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples file-split-ftp - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT File Split FTP File Split FTP http://projects.spring.io/spring-integration @@ -167,7 +167,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -239,21 +239,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java index 990ec1d0..9ef28d0b 100644 --- a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java +++ b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java @@ -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 ftp1() { DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory(); ftp.setHost("host3"); @@ -147,6 +149,7 @@ public class Application { } @Bean + @ConditionalOnMissingBean public SessionFactory ftp2() { DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory(); ftp.setHost("host3"); @@ -156,6 +159,7 @@ public class Application { } @Bean + @ConditionalOnMissingBean public SessionFactory ftp3() { DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory(); ftp.setHost("host3"); diff --git a/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java b/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java index f2aa8237..a53c1b36 100644 --- a/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java +++ b/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java @@ -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 ftp1() throws IOException { + public SessionFactory ftp1() { return mockSf(); } @Bean - public SessionFactory ftp2() throws IOException { + public SessionFactory ftp2() { return mockSf(); } @Bean - public SessionFactory ftp3() throws IOException { + public SessionFactory ftp3() { return mockSf(); } - private SessionFactory mockSf() throws IOException { + private SessionFactory mockSf() { @SuppressWarnings("unchecked") SessionFactory mocksf = mock(SessionFactory.class); given(mocksf.getSession()).willReturn(mockSession()); return mocksf; } - @SuppressWarnings("unchecked") @Bean - public Session mockSession() throws IOException { + @SuppressWarnings("unchecked") + public Session mockSession() { return mock(Session.class); } diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index b4dc2087..1b9f898e 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Loan Broker Sample Loan Broker Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index ab5c80f6..1f6444fc 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Loan Shark Sample Loan Shark Sample http://projects.spring.io/spring-integration @@ -110,7 +110,7 @@ org.aspectj aspectjtools - 1.8.13 + 1.9.0 compile @@ -399,7 +399,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -441,14 +441,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/applications/pom.xml b/applications/pom.xml index 2859dfd5..c47e1078 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples applications - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 5ec3c012..2d7be897 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples stomp-chat - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Web Sockets Stomp Chat Sample Web Sockets Stomp Chat Sample http://projects.spring.io/spring-integration @@ -132,7 +132,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -193,21 +193,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 40c392e0..4077979c 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples amqp - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT AMQP Basic Sample AMQP Basic Sample http://projects.spring.io/spring-integration @@ -129,7 +129,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index fc4df110..07ad0ca2 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples barrier - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Barrier Sample Barrier Sample http://projects.spring.io/spring-integration @@ -143,7 +143,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -204,21 +204,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index f4c50f4c..21c63303 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Control Bus Basic Sample Control Bus Basic Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 62e57e37..ccd69a4e 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples enricher - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Enricher Basic Sample Enricher Basic Sample http://projects.spring.io/spring-integration @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 7a8fdd84..11ee0469 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples feed - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Feed (RSS/ATOM) Basic Sample Feed (RSS/ATOM) Basic Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 023b2574..6c6e32ab 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT File Copy Basic Sample File Copy Basic Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index ed16b714..8b1ec6e1 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ftp - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT FTP Basic Sample FTP Basic Sample http://projects.spring.io/spring-integration @@ -142,7 +142,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -207,14 +207,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index accead8c..2c2b4f83 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Hello World Sample Hello World Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 39126063..b418b10c 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT HTTP Sample HTTP Sample http://projects.spring.io/spring-integration @@ -176,7 +176,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 871099fb..4ee30afe 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT JDBC Basic Sample JDBC Basic Sample http://projects.spring.io/spring-integration @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index dab12e38..4ae53570 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT JMS Basic Sample JMS Basic Sample http://projects.spring.io/spring-integration @@ -89,7 +89,7 @@ org.apache.activemq activemq-broker - 5.15.2 + 5.15.3 compile @@ -101,7 +101,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.2 + 5.15.3 compile @@ -157,7 +157,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 24829591..352a10c7 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT JMX Basic Sample JMX Basic Sample http://projects.spring.io/spring-integration @@ -117,7 +117,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 9475fed8..19ab4d92 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples jpa - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT JPA Basic Sample JPA Basic Sample http://projects.spring.io/spring-integration @@ -145,7 +145,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -206,21 +206,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 63f849b1..ff19f8ab 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples kafka - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Apache Kafka Sample Apache Kafka Sample http://projects.spring.io/spring-integration @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-kafka - 3.0.3.RELEASE + 3.1.0.M1 compile @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.1.8.RELEASE + 2.2.0.M1 compile @@ -150,7 +150,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -211,21 +211,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java index 48a30e7d..b9de5b29 100644 --- a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java +++ b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java @@ -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; diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index f59ef5b4..40234f77 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Mail (IMAP + POP3) Sample Mail (IMAP + POP3) Sample http://projects.spring.io/spring-integration @@ -141,7 +141,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 00aaf0c6..cc84d843 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT MongoDb Basic Sample MongoDb Basic Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index e446bb7b..91b19474 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples mqtt - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT MQTT Basic Sample MQTT Basic Sample http://projects.spring.io/spring-integration @@ -121,7 +121,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -171,21 +171,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index b1fefc5e..2f15e2ed 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Odd-Even Sample Odd-Even Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/pom.xml b/basic/pom.xml index 81ee5785..0b533907 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples basic - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 69fc8815..a28c3107 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Quote Sample Quote Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 8ec59b43..908125f1 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT SFTP Basic Sample SFTP Basic Sample http://projects.spring.io/spring-integration @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 4335d300..30159bb2 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples splunk - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Splunk Sample Splunk Sample http://projects.spring.io/spring-integration @@ -122,7 +122,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -183,21 +183,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 4295b725..d35e9c89 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT TCP-AMQP Basic Sample TCP-AMQP Basic Sample http://projects.spring.io/spring-integration @@ -141,7 +141,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index f865af4a..4cf844c7 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT TCP Client Server Sample TCP Client Server Sample http://projects.spring.io/spring-integration @@ -129,7 +129,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 0bb147b6..cef05910 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Testing Examples Testing Examples http://projects.spring.io/spring-integration @@ -139,7 +139,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -192,14 +192,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index a26fe421..72fd6963 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Twitter Basic Sample Twitter Basic Sample http://projects.spring.io/spring-integration @@ -54,7 +54,8 @@ org.springframework.integration - spring-integration-twitter + spring-integration-social-twitter + 1.0.0.M1 compile @@ -106,7 +107,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +149,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 774b831d..97726aa1 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples web-sockets - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Web Sockets Basic Sample Web Sockets Basic Sample http://projects.spring.io/spring-integration @@ -110,7 +110,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -171,21 +171,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 2c2f6fc1..457d4726 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT WS Inbound Gateway Sample WS Inbound Gateway Sample http://projects.spring.io/spring-integration @@ -128,7 +128,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 7a6d6747..9a39d883 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT WS Outbound Gateway Sample WS Outbound Gateway Sample http://projects.spring.io/spring-integration @@ -117,7 +117,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 537d68ef..ba5db452 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT XML Sample XML Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index a7b865ba..d5826cab 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT XMPP Basic Sample XMPP Basic Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/build.gradle b/build.gradle index 831d64e1..c549d0a2 100644 --- a/build.gradle +++ b/build.gradle @@ -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" diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 7d41c4b3..09ff8358 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples cafe-dsl - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Java DSL Cafe Sample Java DSL Cafe Sample http://projects.spring.io/spring-integration @@ -60,7 +60,7 @@ org.springframework.integration.samples cafe-si - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT compile @@ -134,7 +134,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -195,21 +195,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index ea4f6406..bc55c336 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples kafka-dsl - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Java DSL Kafka Sample Java DSL Kafka Sample http://projects.spring.io/spring-integration @@ -82,7 +82,7 @@ org.springframework.integration spring-integration-kafka - 3.0.3.RELEASE + 3.1.0.M1 compile @@ -134,7 +134,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -195,21 +195,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 0f37a4c3..c5e20f63 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dsl - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -81,7 +81,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -123,14 +123,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 78d393ca..73e15829 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT org.springframework.integration.samples si4demo - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Java Configuration/DSL Sample Java Configuration/DSL Sample http://projects.spring.io/spring-integration @@ -92,7 +92,8 @@ org.springframework.integration - spring-integration-twitter + spring-integration-social-twitter + 1.0.0.M1 compile @@ -190,7 +191,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -251,21 +252,21 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT import pom org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/gradle.properties b/gradle.properties index b66b6bd5..066ea1b3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 91ca28c8..0d4a9516 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 16d28051..a95009c3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 0eb7523c..7a776d8a 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Async Gateway Sample Async Gateway Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 175cbf73..fa5cca1e 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Dynamic Poller Sample Dynamic Poller Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index a306ff6a..0f5f663a 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Error Handling Sample Error Handling Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index b5383cee..ecb771b9 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT File Processing Sample File Processing Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index e5f42ad7..cca2f069 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Mail Attachment Sample Mail Attachment Sample http://projects.spring.io/spring-integration @@ -153,7 +153,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index f372ab89..8d6e557a 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Monitoring Application Monitoring Application http://projects.spring.io/spring-integration @@ -65,7 +65,8 @@ org.springframework.integration - spring-integration-twitter + spring-integration-social-twitter + 1.0.0.M1 compile @@ -151,7 +152,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -193,14 +194,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 3aaaa38b..342bf9fa 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT HTTP Multipart Demo HTTP Multipart Demo http://projects.spring.io/spring-integration @@ -153,7 +153,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 5f72fba5..d01629cb 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples intermediate - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index b966deed..178c3da1 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Spring Integration Rest HTTP Path Usage Demo Spring Integration Rest HTTP Path Usage Demo http://projects.spring.io/spring-integration @@ -144,7 +144,7 @@ org.springframework.security spring-security-web - 5.0.6.RELEASE + 5.1.0.M2 compile @@ -156,7 +156,7 @@ org.springframework.security spring-security-config - 5.0.6.RELEASE + 5.1.0.M2 compile @@ -220,7 +220,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -262,14 +262,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index df5d9781..08485259 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Retry and More Sample Retry and More Sample http://projects.spring.io/spring-integration @@ -99,7 +99,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 compile @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 3eb3285f..eb847c13 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Splitter-Aggregator-Reaper Sample Splitter-Aggregator-Reaper Sample http://projects.spring.io/spring-integration @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 06aa5092..62c19a77 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Derby Stored Procedures Sample Derby Stored Procedures Sample http://projects.spring.io/spring-integration @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 9183280a..8f86034e 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT MS SQLServer Stored Procedures Sample MS SQLServer Stored Procedures Sample http://projects.spring.io/spring-integration @@ -130,7 +130,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -172,14 +172,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 0b222a69..a4862bb6 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Oracle Stored Procedures Sample Oracle Stored Procedures Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index df24393b..8fb6c61a 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT PostgreSQL Stored Procedures Sample PostgreSQL Stored Procedures Sample http://projects.spring.io/spring-integration @@ -142,7 +142,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -184,14 +184,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 0ab48ae2..e77a5e38 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT TCP Client Server Multiplexing Sample TCP Client Server Multiplexing Sample http://projects.spring.io/spring-integration @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 78a6ad7a..551fc1e5 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Travel Services Sample Travel Services Sample http://projects.spring.io/spring-integration @@ -128,7 +128,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index bf7bfcc0..192beecd 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 5.0.0.BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT Transaction Synchronization Sample Transaction Synchronization Sample http://projects.spring.io/spring-integration @@ -129,7 +129,7 @@ org.mockito mockito-core - 2.10.0 + 2.18.0 test @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.0.8.RELEASE + 5.1.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.0.7.RELEASE + 5.1.0.M1 import pom