diff --git a/README.adoc b/README.adoc
index 595bac1d8..4459c48b7 100644
--- a/README.adoc
+++ b/README.adoc
@@ -129,9 +129,23 @@ the `.mvn` configuration, so if you find you have to do it to make a
 build succeed, please raise a ticket to get the settings added to
 source control.
 
-The projects that require middleware (i.e. Redis) for testing generally
-require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
+For hints on how to build the project look in `.travis.yml` if there
+is one. There should be a "script" and maybe "install" command. Also
+look at the "services" section to see if any services need to be
+running locally (e.g. mongo or rabbit).  Ignore the git-related bits
+that you might find in "before_install" since they're related to setting git
+credentials and you already have those.
 
+The projects that require middleware generally include a
+`docker-compose.yml`, so consider using
+https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
+in Docker containers. See the README in the
+https://github.com/spring-cloud-samples/scripts[scripts demo
+repository] for specific instructions about the common cases of mongo,
+rabbit and redis.
+
+NOTE: If all else fails, build with the command from `.travis.yml` (usually
+`./mvnw install`).
 
 === Documentation
 
@@ -364,54 +378,3 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
 - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
 
 IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
-
-=== Duplicate Finder
-
-Spring Cloud Build brings along the  `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
-
-==== Duplicate Finder configuration
-
-Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
-
-.pom.xml
-[source,xml]
-----
-<build>
-    <plugins>
-        <plugin>
-            <groupId>org.basepom.maven</groupId>
-            <artifactId>duplicate-finder-maven-plugin</artifactId>
-        </plugin>
-    </plugins>
-</build>
-----
-
-For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
-
-You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
-
-If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
-
-[source,xml]
-----
-<build>
-    <plugins>
-        <plugin>
-            <groupId>org.basepom.maven</groupId>
-            <artifactId>duplicate-finder-maven-plugin</artifactId>
-            <configuration>
-                <ignoredClassPatterns>
-                    <ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
-                    <ignoredClassPattern>.*module-info</ignoredClassPattern>
-                </ignoredClassPatterns>
-                <ignoredResourcePatterns>
-                    <ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
-                </ignoredResourcePatterns>
-            </configuration>
-        </plugin>
-    </plugins>
-</build>
-
-
-----
-
diff --git a/docs/pom.xml b/docs/pom.xml
index f1d518386..bb5321752 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Function Docs</name>
diff --git a/pom.xml b/pom.xml
index b6c7662f2..8bc1e2b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<artifactId>spring-cloud-function-parent</artifactId>
 	<name>Spring Cloud Function Parent</name>
-	<version>3.1.6</version>
+	<version>3.1.6-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml
index 572f4f854..b2442133d 100644
--- a/spring-cloud-function-adapters/pom.xml
+++ b/spring-cloud-function-adapters/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<name>spring-cloud-function-adapter-parent</name>
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml
index 84b11b529..5672ba358 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-adapter-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml
index 3432eaa43..56871c40b 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-adapter-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml
index 77e5a200e..2f65d77ea 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<artifactId>spring-cloud-function-adapter-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml
index f7f73b1aa..d91270420 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-adapter-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml
index bc764eedf..d55480f7e 100644
--- a/spring-cloud-function-compiler/pom.xml
+++ b/spring-cloud-function-compiler/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml
index ec00d2f00..baa0c76bf 100644
--- a/spring-cloud-function-context/pom.xml
+++ b/spring-cloud-function-context/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml
index e0c462811..d69ce806b 100644
--- a/spring-cloud-function-core/pom.xml
+++ b/spring-cloud-function-core/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml
index 1814272f0..357d353b0 100644
--- a/spring-cloud-function-dependencies/pom.xml
+++ b/spring-cloud-function-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.0.5</version>
+		<version>3.0.5-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-function-dependencies</artifactId>
-	<version>3.1.6</version>
+	<version>3.1.6-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Function Dependencies</name>
 	<description>Spring Cloud Function Dependencies</description>
diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml
index 68a5fd244..cddee5c74 100644
--- a/spring-cloud-function-deployer/pom.xml
+++ b/spring-cloud-function-deployer/pom.xml
@@ -10,7 +10,7 @@
 		<parent>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-parent</artifactId>
-			<version>3.1.6</version>
+			<version>3.1.6-SNAPSHOT</version>
 		</parent>
 
 	<properties>
diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml
index 6e46a518f..bbe21f5c0 100644
--- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml
@@ -12,13 +12,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml
index f816c4a63..fe9c1b49d 100644
--- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml
@@ -12,13 +12,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath />
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.17.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml
index 06bc9eb08..796f8ddfe 100644
--- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml
@@ -12,13 +12,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml
index f4354d99e..005102f0b 100644
--- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml
@@ -12,13 +12,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml
index ee7dfcb78..b73628f9e 100644
--- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml
@@ -12,13 +12,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml
index ce1a5db53..429c91fdb 100644
--- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml
@@ -12,13 +12,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml
index 88be14125..110720b1b 100644
--- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml
@@ -12,13 +12,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath />
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml
index 33c9dabca..8ea20829c 100644
--- a/spring-cloud-function-kotlin/pom.xml
+++ b/spring-cloud-function-kotlin/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml
index c5404ca98..534bcf202 100644
--- a/spring-cloud-function-rsocket/pom.xml
+++ b/spring-cloud-function-rsocket/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml
index d3b581251..f8cbe3211 100644
--- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml
+++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -25,7 +25,7 @@
 		<java.version>1.8</java.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 		<aws-lambda-events.version>3.9.0</aws-lambda-events.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml
index 729e49d39..08546f25d 100644
--- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.spring.sample</groupId>
@@ -17,7 +17,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml
index a213f0b9c..ced43ecda 100644
--- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.spring.sample</groupId>
@@ -17,7 +17,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml
index 953a7cad6..33fdcfc8b 100644
--- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -25,7 +25,7 @@
 		<java.version>1.8</java.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 		<aws-lambda-events.version>2.0.2</aws-lambda-events.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml
index 19d669755..f68d38f02 100644
--- a/spring-cloud-function-samples/function-sample-aws/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -25,7 +25,7 @@
 		<java.version>1.8</java.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 		<aws-lambda-events.version>2.0.2</aws-lambda-events.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml
index 689df7fc2..422d463c8 100644
--- a/spring-cloud-function-samples/function-sample-azure/pom.xml
+++ b/spring-cloud-function-samples/function-sample-azure/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml
index 9d9049609..122a59a2d 100644
--- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml
+++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml
@@ -12,13 +12,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml
index 3fe25e45a..23212139b 100644
--- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml
+++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml
@@ -11,13 +11,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml
index c07f6e208..dd0055a98 100644
--- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml
+++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml
@@ -11,13 +11,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml
index 3c10240f4..0c45a6496 100644
--- a/spring-cloud-function-samples/function-sample-compiler/pom.xml
+++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml
@@ -14,13 +14,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<reactor.version>3.1.2.RELEASE</reactor.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
diff --git a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml
index c79a86462..be0aab22c 100644
--- a/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml
+++ b/spring-cloud-function-samples/function-sample-functional-aws-routing/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -25,7 +25,7 @@
 		<java.version>1.8</java.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 		<aws-lambda-events.version>2.0.2</aws-lambda-events.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.2.0-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml
index 952bb7009..07c5c5ef3 100644
--- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml
+++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml
index f66c1385d..72241aa5c 100644
--- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml
+++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml
@@ -15,12 +15,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.2.1-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
index 924cf1feb..f80c9d44d 100644
--- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
+++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml
index 76caff0e0..9697ad591 100644
--- a/spring-cloud-function-samples/function-sample-pof/pom.xml
+++ b/spring-cloud-function-samples/function-sample-pof/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<reactor.version>3.1.2.RELEASE</reactor.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml
index 5d9fddda6..adfa50410 100644
--- a/spring-cloud-function-samples/function-sample-pojo/pom.xml
+++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml
@@ -14,13 +14,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml
index 2166701d0..c00ffc07f 100644
--- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml
+++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath />
 	</parent>
 
@@ -20,7 +20,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml
index 829df9a62..c44ec87ec 100644
--- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml
+++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml
@@ -14,13 +14,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml
index e34ca9ca1..eaa242c88 100644
--- a/spring-cloud-function-samples/function-sample-task/pom.xml
+++ b/spring-cloud-function-samples/function-sample-task/pom.xml
@@ -14,13 +14,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 		<reactor.version>3.1.2.RELEASE</reactor.version>
 	</properties>
diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml
index c5b4d6e81..4843464d0 100644
--- a/spring-cloud-function-samples/function-sample/pom.xml
+++ b/spring-cloud-function-samples/function-sample/pom.xml
@@ -14,13 +14,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.13</version>
+		<version>2.5.5</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.27.RELEASE</wrapper.version>
 	</properties>
 
diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml
index b723f5edd..09f1c4a85 100644
--- a/spring-cloud-function-samples/pom.xml
+++ b/spring-cloud-function-samples/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<modules>
diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml
index 5bf99639c..64fe2c149 100644
--- a/spring-cloud-function-task/pom.xml
+++ b/spring-cloud-function-task/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml
index 5aaad8624..1f14b0762 100644
--- a/spring-cloud-function-web/pom.xml
+++ b/spring-cloud-function-web/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml
index 1b418b220..4c28e91e5 100644
--- a/spring-cloud-starter-function-web/pom.xml
+++ b/spring-cloud-starter-function-web/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-function-web</artifactId>
diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml
index 0c5c625a9..7536e8eab 100644
--- a/spring-cloud-starter-function-webflux/pom.xml
+++ b/spring-cloud-starter-function-webflux/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-function-webflux</artifactId>
 	<name>spring-cloud-starter-function-webflux</name>