diff --git a/README.adoc b/README.adoc
index 5e48c370b..b5cd823ef 100644
--- a/README.adoc
+++ b/README.adoc
@@ -86,7 +86,7 @@ Please visit the https://docs.spring.io/spring-cloud-sleuth/docs/[documentation
 
 == Building
 
-:jdkversion: 1.8
+:jdkversion: 17
 
 === Basic Compile and Test
 
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 1f47a5774..4dcc8e8d5 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -22,13 +22,13 @@
 	<name>Benchmarks</name>
 	<description>Benchmarks (JMH)</description>
 	<groupId>org.springframework.cloud</groupId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1</version>
 	<artifactId>benchmarks</artifactId>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>2.6.3</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/docs/pom.xml b/docs/pom.xml
index ef7638f81..4582a2a84 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 	</parent>
 	<artifactId>spring-cloud-sleuth-docs</artifactId>
 	<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 0dfa6ce96..e30aa6109 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-sleuth</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Sleuth</name>
 	<description>Spring Cloud Sleuth</description>
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -62,16 +62,16 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
 		<maven.compiler.testSource>1.8</maven.compiler.testSource>
-		<spring-cloud-build.version>3.1.1-SNAPSHOT</spring-cloud-build.version>
-		<spring-cloud-commons.version>3.1.1-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-gateway.version>3.1.1-SNAPSHOT</spring-cloud-gateway.version>
-		<spring-cloud-config.version>3.1.1-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-circuitbreaker.version>2.1.1-SNAPSHOT</spring-cloud-circuitbreaker.version>
-		<spring-cloud-stream.version>3.2.1</spring-cloud-stream.version>
-		<spring-cloud-function.version>3.2.1</spring-cloud-function.version>
-		<spring-cloud-netflix.version>3.1.1-SNAPSHOT</spring-cloud-netflix.version>
-		<spring-cloud-openfeign.version>3.1.1-SNAPSHOT</spring-cloud-openfeign.version>
-		<spring-cloud-task.version>2.4.1-SNAPSHOT</spring-cloud-task.version>
+		<spring-cloud-build.version>3.1.1</spring-cloud-build.version>
+		<spring-cloud-commons.version>3.1.1</spring-cloud-commons.version>
+		<spring-cloud-gateway.version>3.1.1</spring-cloud-gateway.version>
+		<spring-cloud-config.version>3.1.1</spring-cloud-config.version>
+		<spring-cloud-circuitbreaker.version>2.1.1</spring-cloud-circuitbreaker.version>
+		<spring-cloud-stream.version>3.2.2</spring-cloud-stream.version>
+		<spring-cloud-function.version>3.2.2</spring-cloud-function.version>
+		<spring-cloud-netflix.version>3.1.1</spring-cloud-netflix.version>
+		<spring-cloud-openfeign.version>3.1.1</spring-cloud-openfeign.version>
+		<spring-cloud-task.version>2.4.1</spring-cloud-task.version>
 		<spring-cloud-deployer.version>2.5.1</spring-cloud-deployer.version>
 		<brave.version>5.13.7</brave.version>
 		<opentracing.version>0.32.0</opentracing.version>
diff --git a/spring-cloud-sleuth-api/pom.xml b/spring-cloud-sleuth-api/pom.xml
index 92249a787..ad9a7159b 100644
--- a/spring-cloud-sleuth-api/pom.xml
+++ b/spring-cloud-sleuth-api/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-autoconfigure/pom.xml b/spring-cloud-sleuth-autoconfigure/pom.xml
index 5d37a2504..3a50443e1 100644
--- a/spring-cloud-sleuth-autoconfigure/pom.xml
+++ b/spring-cloud-sleuth-autoconfigure/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-brave/pom.xml b/spring-cloud-sleuth-brave/pom.xml
index 12302c602..b636574b6 100644
--- a/spring-cloud-sleuth-brave/pom.xml
+++ b/spring-cloud-sleuth-brave/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-dependencies/.flattened-pom.xml b/spring-cloud-sleuth-dependencies/.flattened-pom.xml
new file mode 100644
index 000000000..d4dfae45a
--- /dev/null
+++ b/spring-cloud-sleuth-dependencies/.flattened-pom.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2013-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
+  ~
+  ~      https://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.
+  -->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-dependencies-parent</artifactId>
+    <version>3.1.1</version>
+    <relativePath></relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-sleuth-dependencies</artifactId>
+  <version>3.1.1</version>
+  <packaging>pom</packaging>
+  <name>spring-cloud-sleuth-dependencies</name>
+  <description>Spring Cloud Sleuth Dependencies</description>
+  <url>https://projects.spring.io/spring-cloud/spring-cloud-sleuth-dependencies/</url>
+  <organization>
+    <name>Pivotal Software, Inc.</name>
+    <url>https://www.spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>Copyright 2014-2021 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
+
+				https://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.</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>dsyer</id>
+      <name>Dave Syer</name>
+      <email>dsyer at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>Project lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sgibb</id>
+      <name>Spencer Gibb</name>
+      <email>sgibb at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>Project lead</role>
+      </roles>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-sleuth.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-sleuth.git</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-sleuth</url>
+  </scm>
+  <distributionManagement>
+    <repository>
+      <id>repo.spring.io</id>
+      <name>Spring Release Repository</name>
+      <url>https://repo.spring.io/libs-release-local</url>
+    </repository>
+    <snapshotRepository>
+      <id>repo.spring.io</id>
+      <name>Spring Snapshot Repository</name>
+      <url>https://repo.spring.io/libs-snapshot-local</url>
+    </snapshotRepository>
+    <site>
+      <id>spring-docs</id>
+      <url>https:/docs.spring.io/spring-cloud-dependencies-parent/docs/3.1.1/reference/html/spring-cloud-sleuth-dependencies/</url>
+    </site>
+    <downloadUrl>https://github.com/spring-cloud</downloadUrl>
+  </distributionManagement>
+  <properties>
+    <brave.opentracing.version>0.37.4</brave.opentracing.version>
+    <grpc.spring.boot.version>4.2.2</grpc.spring.boot.version>
+    <brave.version>5.13.7</brave.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-sleuth-autoconfigure</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-sleuth-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-sleuth-instrumentation</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-sleuth-brave</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-starter-sleuth</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-sleuth-tests-common</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.zipkin.brave</groupId>
+        <artifactId>brave-bom</artifactId>
+        <version>${brave.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.opentracing.brave</groupId>
+        <artifactId>brave-opentracing</artifactId>
+        <version>${brave.opentracing.version}</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>*</artifactId>
+            <groupId>io.zipkin.brave</groupId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>io.github.lognet</groupId>
+        <artifactId>grpc-spring-boot-starter</artifactId>
+        <version>${grpc.spring.boot.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <profiles>
+    <profile>
+      <id>spring</id>
+      <repositories>
+        <repository>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+          <id>spring-snapshots</id>
+          <name>Spring Snapshots</name>
+          <url>https://repo.spring.io/snapshot</url>
+        </repository>
+        <repository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>spring-milestones</id>
+          <name>Spring Milestones</name>
+          <url>https://repo.spring.io/milestone</url>
+        </repository>
+        <repository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>spring-releases</id>
+          <name>Spring Releases</name>
+          <url>https://repo.spring.io/release</url>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+          <id>spring-snapshots</id>
+          <name>Spring Snapshots</name>
+          <url>https://repo.spring.io/snapshot</url>
+        </pluginRepository>
+        <pluginRepository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>spring-milestones</id>
+          <name>Spring Milestones</name>
+          <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+</project>
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index bf24fea66..c38f90b6c 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -22,11 +22,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.0</version>
+		<version>3.1.1</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-sleuth-dependencies</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
diff --git a/spring-cloud-sleuth-instrumentation/pom.xml b/spring-cloud-sleuth-instrumentation/pom.xml
index 5560f17af..aa8daa91e 100644
--- a/spring-cloud-sleuth-instrumentation/pom.xml
+++ b/spring-cloud-sleuth-instrumentation/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 	
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index d4da42a78..3f355083e 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
index e4dc95533..fd7b10a74 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
index 9027626f6..0fd4729ef 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
index fbe01dacc..755383fc8 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
index 617209103..f7a1ead06 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
index 3e451027b..7529fc2d3 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
index dfb595047..6bedaa2eb 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index a8efeb2b9..95e312f34 100644
--- a/spring-cloud-sleuth-zipkin/pom.xml
+++ b/spring-cloud-sleuth-zipkin/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml
index bb7610c6a..22b4dbcc5 100644
--- a/spring-cloud-starter-sleuth/pom.xml
+++ b/spring-cloud-starter-sleuth/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-sleuth</artifactId>
diff --git a/tests/brave/pom.xml b/tests/brave/pom.xml
index 1ff393257..dbd461f7f 100644
--- a/tests/brave/pom.xml
+++ b/tests/brave/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-actuator-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-actuator-tests/pom.xml
index 19a51c150..028195d52 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-actuator-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-actuator-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml
index 9602d6767..320f34363 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
index d88a10b3f..030d37fa0 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml
index c40eb919a..0187f5e5f 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/pom.xml
index c7fc77f20..22a00e4e2 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/pom.xml
index ff71e56f8..e35cd7056 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml
index 3f33aa99e..07f5a168e 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-config-server-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-config-server-tests/pom.xml
index 232418f3f..207901ce9 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-config-server-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-config-server-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
index 293b86e31..afd0252d9 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml
index 58bb77356..57c20a5d7 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
index 0d2ddb5e8..2ebf32086 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/pom.xml
index f19d4e9cd..e14b97bb9 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-kafka-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-kafka-tests/pom.xml
index 219618bd9..6c78016c3 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-kafka-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-kafka-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-kotlin-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-kotlin-tests/pom.xml
index 9cf53703f..85711a6ad 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-kotlin-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-kotlin-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
index aa1409a55..410d34427 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
index faa5a45d6..7cf735e0b 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-mongodb-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-mongodb-tests/pom.xml
index 47c9ab721..83d4c08f9 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-mongodb-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-mongodb-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
index 31765c2da..6af088cff 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml
index 834a05099..5130cf259 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-r2dbc-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-r2dbc-tests/pom.xml
index a3d858a6e..f97b6a328 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-r2dbc-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-r2dbc-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
index 538175b2d..dff002ef3 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-rsocket-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-rsocket-tests/pom.xml
index ec812df42..3e3f88a69 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-rsocket-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-rsocket-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
index 4465d5ad0..91f8296e0 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
index 4421b116a..daaed73b6 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-security-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-security-tests/pom.xml
index 58709d983..40bccc40a 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-security-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-security-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-task-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-task-tests/pom.xml
index 712efc6a1..dbb4cf3bf 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-task-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-task-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
index 901c4c706..a09cf4f25 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml b/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml
index 02017cf06..9f4654281 100644
--- a/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/common/pom.xml b/tests/common/pom.xml
index f9313225c..1cc4c814e 100644
--- a/tests/common/pom.xml
+++ b/tests/common/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index b11e55b32..04c807f93 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1</version>
 		<relativePath>..</relativePath>
 	</parent>