Start version 5.1 with appropriate fixes

spring-projects · Jul 30, 2018 · c0f406d · c0f406d
1 parent d4f96b9
commit c0f406d
Show file tree

Hide file tree

Showing 75 changed files with 340 additions and 317 deletions.
diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml
@@ -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>

diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml
@@ -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>

diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml
@@ -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>

diff --git a/.../java/org/springframework/integration/samples/dynamictcp/DynamicTcpClientApplication.java b/.../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.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 @@ private MessageChannel createNewSubflow(Message<?> message) {
 			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
@@ -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>

diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml
@@ -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>

diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml
@@ -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>

diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml
@@ -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>

diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml
@@ -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>

diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml
@@ -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>

diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml
@@ -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>