Merge branch 'main' into dependabot/gradle/main/io.micrometer-microme…

…ter-tracing-bom-1.3.2
micrometer-metrics · Aug 9, 2024 · 5a3b766 · 5a3b766
2 parents 41f634d + feab957
commit 5a3b766
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
-micrometer = "1.13.1"
+micrometer = "1.13.2"
 micrometerTracing = "1.3.2"
 junit = "5.10.3"
 roaster = "2.22.3.Final" # last using jdk8
 handlebars = "4.3.1"
 picocli = "4.7.6"
 logback = "1.5.6"
 slf4j = "1.7.36"
-assertj = "3.26.0"
+assertj = "3.26.3"
 mockito = "5.5.0"
 asmForPlugins = "7.3.1"
 javaFormatForPlugins = "0.0.42"

diff --git a/settings.gradle b/settings.gradle
@@ -5,8 +5,8 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.gradle.develocity' version '3.17.5'
-	id 'io.spring.ge.conventions' version '0.0.17'
+	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'
 }