Merge branch '1.2.x' into 1.3.x

Author: jonatan-ivanov

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 micrometer = "1.13.4"
-micrometerContextPropagation="1.1.1"
-junit = "5.10.3"
+micrometerContextPropagation="1.1.2"
+junit = "5.10.5"
 javaxServlet="4.0.1"
 jmh="1.37"
 jakartaWeb="9.1.0"

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 
 plugins {
 	id 'com.gradle.develocity' version '3.17.6'
-	id 'io.spring.develocity.conventions' version '0.0.20'
+	id 'io.spring.develocity.conventions' version '0.0.22'
 	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }