diff --git a/README.adoc b/README.adoc
index 4459c48b7..c94e77b01 100644
--- a/README.adoc
+++ b/README.adoc
@@ -103,7 +103,7 @@ string like that.)
 
 == Building
 
-:jdkversion: 1.8
+:jdkversion: 17
 
 === Basic Compile and Test
 
@@ -129,23 +129,9 @@ 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.
 
-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 (i.e. Redis) for testing generally
+require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
 
-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
 
@@ -378,3 +364,54 @@ 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 c45ff27b2..3949ce854 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.8-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Function Docs</name>
diff --git a/pom.xml b/pom.xml
index 8f5a13980..fa7df8f8b 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.8-SNAPSHOT</version>
+	<version>3.1.7-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml
index e51998ba0..9e619a057 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.8-SNAPSHOT</version>
+		<version>3.1.7-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 07d05e4c3..c81c7fb7a 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.8-SNAPSHOT</version>
+		<version>3.1.7-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 d574dc777..66b199d8b 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.8-SNAPSHOT</version>
+		<version>3.1.7-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 702be46b2..f2ad2c3b0 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.8-SNAPSHOT</version>
+		<version>3.1.7-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 303997010..126c4b81a 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.8-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml
index 3532b2830..2b27880cc 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.8-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml
index 45715df02..b4a89674d 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.8-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml
index 13d3168b5..7f07b81e9 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.8-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml
index e6acd6416..16df2a811 100644
--- a/spring-cloud-function-dependencies/pom.xml
+++ b/spring-cloud-function-dependencies/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-function-dependencies</artifactId>
-	<version>3.1.8-SNAPSHOT</version>
+	<version>3.1.7-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 fc10875de..86905c3f4 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.8-SNAPSHOT</version>
+			<version>3.1.7-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 22625cfd4..14755023e 100644
--- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml
@@ -18,7 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 47a19aa8d..772efc8d3 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
@@ -18,7 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 3ad035030..ad3aa1f70 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
@@ -18,7 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 ede2ad3c1..c871deb25 100644
--- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml
@@ -18,7 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 6fe0ce54f..486ff64b0 100644
--- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml
@@ -18,7 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 6aadcd121..b04be517c 100644
--- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml
@@ -18,7 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 220ea1ef7..916e09476 100644
--- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml
+++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml
@@ -18,7 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 b577d56da..fe008fe44 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.8-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml
index c280d363f..59c0df58e 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.8-SNAPSHOT</version>
+		<version>3.1.7-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 ec49b4c4c..a675d75a4 100644
--- a/spring-cloud-function-samples/function-functional-sample-aws/pom.xml
+++ b/spring-cloud-function-samples/function-functional-sample-aws/pom.xml
@@ -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.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 6d9a3dfb4..912bd40ff 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
@@ -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.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 07a953fe4..8bb47c2ae 100644
--- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml
@@ -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.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 10b6d575e..a3cef7c93 100644
--- a/spring-cloud-function-samples/function-sample-aws-routing/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws-routing/pom.xml
@@ -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.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 cf45bc5c6..da2722f9a 100644
--- a/spring-cloud-function-samples/function-sample-aws/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws/pom.xml
@@ -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.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
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 a7e7b425d..551a27a5a 100644
--- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml
+++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/pom.xml
@@ -18,7 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 9dfeb2e2b..bcec45097 100644
--- a/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml
+++ b/spring-cloud-function-samples/function-sample-cloudevent-stream/pom.xml
@@ -17,7 +17,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 1764b2752..bd5fd4944 100644
--- a/spring-cloud-function-samples/function-sample-cloudevent/pom.xml
+++ b/spring-cloud-function-samples/function-sample-cloudevent/pom.xml
@@ -17,7 +17,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 43c5e0519..9e2357d06 100644
--- a/spring-cloud-function-samples/function-sample-compiler/pom.xml
+++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml
@@ -20,7 +20,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 aa61dcbcb..1d9b04f3a 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
@@ -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.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
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 46c006683..0da87d852 100644
--- a/spring-cloud-function-samples/function-sample-gcp-http/pom.xml
+++ b/spring-cloud-function-samples/function-sample-gcp-http/pom.xml
@@ -20,7 +20,7 @@
 	</parent>
 
 	<properties>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-SNAPSHOT</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml
index 62747b615..85da3a684 100644
--- a/spring-cloud-function-samples/function-sample-pof/pom.xml
+++ b/spring-cloud-function-samples/function-sample-pof/pom.xml
@@ -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.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 368617fd7..ca2489d4a 100644
--- a/spring-cloud-function-samples/function-sample-pojo/pom.xml
+++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml
@@ -20,7 +20,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 8da41c1cd..9070ec709 100644
--- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml
+++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml
@@ -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.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 485e33b6a..cc3195333 100644
--- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml
+++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml
@@ -20,7 +20,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 12bd81e2f..e0782164a 100644
--- a/spring-cloud-function-samples/function-sample-task/pom.xml
+++ b/spring-cloud-function-samples/function-sample-task/pom.xml
@@ -20,7 +20,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 681366259..3b584afde 100644
--- a/spring-cloud-function-samples/function-sample/pom.xml
+++ b/spring-cloud-function-samples/function-sample/pom.xml
@@ -20,7 +20,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>3.1.8-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.7-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 d0fbdb590..030e2982e 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.8-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 
 	<modules>
diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml
index 3bc2ca1cf..89cd828da 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.8-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml
index 28aa5a307..d559294b0 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.8-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml
index 1aeef8eb5..9496f23a3 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.8-SNAPSHOT</version>
+		<version>3.1.7-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 62df591e4..2b791c83d 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.8-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-function-webflux</artifactId>
 	<name>spring-cloud-starter-function-webflux</name>