Update SNAPSHOT to 3.1.11

spring-cloud · Feb 9, 2024 · acf064c · acf064c
1 parent a091944
commit acf064c
Show file tree

Hide file tree

Showing 49 changed files with 75 additions and 64 deletions.
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -22,7 +22,7 @@
 	<name>Benchmarks</name>
 	<description>Benchmarks (JMH)</description>
 	<groupId>org.springframework.cloud</groupId>
-	<version>3.1.11-SNAPSHOT</version>
+	<version>3.1.11</version>
 	<artifactId>benchmarks</artifactId>
 
 	<parent>

diff --git 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.11-SNAPSHOT</version>
+		<version>3.1.11</version>
 	</parent>
 	<artifactId>spring-cloud-sleuth-docs</artifactId>
 	<packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -21,15 +21,15 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-sleuth</artifactId>
-	<version>3.1.11-SNAPSHOT</version>
+	<version>3.1.11</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Sleuth</name>
 	<description>Spring Cloud Sleuth</description>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.10-SNAPSHOT</version>
+		<version>3.1.9</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -49,15 +49,15 @@
 		<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.10-SNAPSHOT</spring-cloud-build.version>
-		<spring-cloud-commons.version>3.1.9-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-build.version>3.1.9</spring-cloud-build.version>
+		<spring-cloud-commons.version>3.1.8</spring-cloud-commons.version>
 		<spring-cloud-gateway.version>3.1.9</spring-cloud-gateway.version>
-		<spring-cloud-config.version>3.1.10-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-circuitbreaker.version>2.1.9-SNAPSHOT</spring-cloud-circuitbreaker.version>
-		<spring-cloud-stream.version>3.2.11-SNAPSHOT</spring-cloud-stream.version>
-		<spring-cloud-function.version>3.2.13-SNAPSHOT</spring-cloud-function.version>
-		<spring-cloud-netflix.version>3.1.9-SNAPSHOT</spring-cloud-netflix.version>
-		<spring-cloud-openfeign.version>3.1.10-SNAPSHOT</spring-cloud-openfeign.version>
+		<spring-cloud-config.version>3.1.9</spring-cloud-config.version>
+		<spring-cloud-circuitbreaker.version>2.1.8</spring-cloud-circuitbreaker.version>
+		<spring-cloud-stream.version>3.2.10</spring-cloud-stream.version>
+		<spring-cloud-function.version>3.2.12</spring-cloud-function.version>
+		<spring-cloud-netflix.version>3.1.8</spring-cloud-netflix.version>
+		<spring-cloud-openfeign.version>3.1.9</spring-cloud-openfeign.version>
 		<spring-cloud-task.version>2.4.6</spring-cloud-task.version>
 		<spring-cloud-deployer.version>2.5.2</spring-cloud-deployer.version>
 		<!-- Deprecated - reached EOL -->

diff --git 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.11-SNAPSHOT</version>
+		<version>3.1.11</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git 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.11-SNAPSHOT</version>
+		<version>3.1.11</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git 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.11-SNAPSHOT</version>
+		<version>3.1.11</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git a/spring-cloud-sleuth-dependencies/.flattened-pom.xml b/spring-cloud-sleuth-dependencies/.flattened-pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-dependencies-parent</artifactId>
-    <version>3.1.3</version>
+    <version>3.1.9</version>
     <relativePath></relativePath>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-sleuth-dependencies</artifactId>
-  <version>3.1.3</version>
+  <version>3.1.11</version>
   <packaging>pom</packaging>
   <name>spring-cloud-sleuth-dependencies</name>
   <description>Spring Cloud Sleuth Dependencies</description>
@@ -95,15 +95,15 @@
     </snapshotRepository>
     <site>
       <id>spring-docs</id>
-      <url>https:/docs.spring.io/spring-cloud-dependencies-parent/docs/3.1.3/reference/html/spring-cloud-sleuth-dependencies/</url>
+      <url>https:/docs.spring.io/spring-cloud-dependencies-parent/docs/3.1.9/reference/html/spring-cloud-sleuth-dependencies/</url>
     </site>
     <downloadUrl>https://github.com/spring-cloud</downloadUrl>
   </distributionManagement>
   <properties>
+    <grpc.spring.boot.version>4.2.3</grpc.spring.boot.version>
+    <brave.version>5.18.1</brave.version>
+    <zipkin-reporter.version>2.17.2</zipkin-reporter.version>
     <brave.opentracing.version>1.0.1</brave.opentracing.version>
-    <grpc.spring.boot.version>4.2.2</grpc.spring.boot.version>
-	<zipkin-reporter.version>2.17.2</zipkin-reporter.version>
-	<brave.version>5.18.0</brave.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -156,6 +156,17 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>io.zipkin.brave</groupId>
+        <artifactId>brave</artifactId>
+        <version>${brave.version}</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>*</artifactId>
+            <groupId>*</groupId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>io.opentracing.brave</groupId>
         <artifactId>brave-opentracing</artifactId>

diff --git 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.10-SNAPSHOT</version>
+		<version>3.1.9</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-sleuth-dependencies</artifactId>
-	<version>3.1.11-SNAPSHOT</version>
+	<version>3.1.11</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
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git 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.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git 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.11-SNAPSHOT</version>
+		<version>3.1.11</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git 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.11-SNAPSHOT</version>
+		<version>3.1.11</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-sleuth</artifactId>

diff --git 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.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</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
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.11-SNAPSHOT</version>
+		<version>3.1.11</version>
 		<relativePath>..</relativePath>
 	</parent>