Merge branch '1.2.x' into dependabot/gradle/1.2.x/io.micrometer-conte…

…xt-propagation-1.1.2
micrometer-metrics · Oct 14, 2024 · 47a35cf · 47a35cf
2 parents 7c11407 + 0a97118
commit 47a35cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 micrometer = "1.12.10"
 micrometerContextPropagation="1.1.2"
-junit = "5.10.3"
+junit = "5.10.5"
 javaxServlet="4.0.1"
 jmh="1.37"
 jakartaWeb="9.1.0"

diff --git a/settings.gradle b/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'
 }