Merge branch '1.2.x' into 1.3.x

micrometer-metrics · Aug 9, 2024 · 531a1f0 · 531a1f0
2 parents 66f9fa8 + fe1da20
commit 531a1f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -16,14 +16,14 @@ log4j = "2.23.1"
 wavefrontReporter="1.7.16"
 slf4j = "1.7.36"
 assertj = "3.25.3"
-awaitility = "4.2.1"
+awaitility = "4.2.2"
 mockito = "5.12.0"
 wiremock = "3.0.1"
 testcontainers = "1.19.8"
 braveBom = "6.0.3"
 bravePropagationW3c = "0.2.0"
 zipkinReporterBom = "3.4.0"
-reactorBom = "2022.0.20"
+reactorBom = "2022.0.21"
 asmForPlugins = "7.3.1"
 javaFormatForPlugins = "0.0.42"
 jsr305 = "3.0.2"

diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.gradle.develocity' version '3.17.5'
+	id 'com.gradle.develocity' version '3.17.6'
 	id 'io.spring.develocity.conventions' version '0.0.19'
 	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }