Merge branch '1.0.x' into 1.1.x

Author: jonatan-ivanov

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ assertj = "3.24.2"
 mockito = "5.7.0"
 javaFormatForPlugins = "0.0.43"
 jsr305 = "3.0.2"
-junit = "5.10.3"
+junit = "5.10.4"
 slf4j = "2.0.16"
 logback = "1.4.14"
 

settings.gradle

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