Upgrade to the latest releases

basic/amqp/pom.xml

@@ -171,14 +171,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/barrier/pom.xml

@@ -211,14 +211,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/control-bus/pom.xml

@@ -148,14 +148,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/enricher/pom.xml

@@ -160,14 +160,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/feed/pom.xml

@@ -148,14 +148,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/file/pom.xml

@@ -148,14 +148,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/ftp/pom.xml

@@ -207,14 +207,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/helloworld/pom.xml

@@ -148,14 +148,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/http/pom.xml

@@ -218,14 +218,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/jdbc/pom.xml

@@ -160,14 +160,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/jms/pom.xml

@@ -210,14 +210,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/jmx/pom.xml

@@ -159,14 +159,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/jpa/pom.xml

@@ -213,14 +213,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/kafka/pom.xml

@@ -218,14 +218,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/mail/pom.xml

@@ -183,14 +183,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/mongodb/pom.xml

@@ -148,14 +148,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/mqtt/pom.xml

@@ -178,14 +178,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/oddeven/pom.xml

@@ -148,14 +148,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/quote/pom.xml

@@ -148,14 +148,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/sftp/pom.xml

@@ -160,14 +160,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/splunk/pom.xml

@@ -190,14 +190,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/tcp-amqp/pom.xml

@@ -183,14 +183,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/tcp-broadcast/pom.xml

@@ -189,14 +189,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/tcp-client-server/pom.xml

@@ -171,14 +171,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/tcp-with-headers/pom.xml

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework.integration.samples</groupId>
+  <artifactId>tcp-with-headers</artifactId>
+  <version>5.1.1.BUILD-SNAPSHOT</version>
+  <url>https://projects.spring.io/spring-integration</url>
+  <organization>
+    <name>SpringIO</name>
+    <url>https://spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>garyrussell</id>
+      <name>Gary Russell</name>
+      <email>grussell@pivotal.io</email>
+      <roles>
+        <role>project lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>markfisher</id>
+      <name>Mark Fisher</name>
+      <email>mfisher@pivotal.io</email>
+      <roles>
+        <role>project founder and lead emeritus</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>ghillert</id>
+      <name>Gunnar Hillert</name>
+      <email>ghillert@pivotal.io</email>
+    </developer>
+    <developer>
+      <id>abilan</id>
+      <name>Artem Bilan</name>
+      <email>abilan@pivotal.io</email>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git</connection>
+    <developerConnection>scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git</developerConnection>
+    <url>https://github.com/spring-projects/spring-integration-samples</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jackson-module-kotlin</artifactId>
+          <groupId>com.fasterxml.jackson.module</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jackson-module-kotlin</artifactId>
+          <groupId>com.fasterxml.jackson.module</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.18.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jackson-module-kotlin</artifactId>
+          <groupId>com.fasterxml.jackson.module</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jackson-module-kotlin</artifactId>
+          <groupId>com.fasterxml.jackson.module</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>repo.spring.io.milestone</id>
+      <name>Spring Framework Maven Milestone Repository</name>
+      <url>https://repo.spring.io/libs-milestone</url>
+    </repository>
+    <repository>
+      <id>repo.spring.io.snapshot</id>
+      <name>Spring Framework Maven Snapshot Repository</name>
+      <url>https://repo.spring.io/libs-snapshot</url>
+    </repository>
+  </repositories>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-framework-bom</artifactId>
+        <version>5.1.18.RELEASE</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.integration</groupId>
+        <artifactId>spring-integration-bom</artifactId>
+        <version>5.1.13.RELEASE</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+</project>

basic/testing-examples/pom.xml

@@ -192,14 +192,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/twitter/pom.xml

@@ -149,14 +149,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/web-sockets/pom.xml

@@ -178,14 +178,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/ws-inbound-gateway/pom.xml

@@ -170,14 +170,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/ws-outbound-gateway/pom.xml

@@ -159,14 +159,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/xml/pom.xml

@@ -148,14 +148,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

basic/xmpp/pom.xml

@@ -148,14 +148,14 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.1.17.RELEASE</version>
+        <version>5.1.18.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
-        <version>5.1.12.RELEASE</version>
+        <version>5.1.13.RELEASE</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>