Merge branch '1.13.x'

Author: shakuzen

gradle/libs.versions.toml

@@ -64,7 +64,7 @@ maven-resolver = "1.9.22"
 mockito4 = "4.11.0"
 mockito5 = "5.11.0"
 mongo = "4.11.4"
-netty = "4.1.113.Final"
+netty = "4.1.114.Final"
 newrelic-api = "5.14.0"
 # Kotlin 1.7 sample will fail from OkHttp 4.12.0 due to okio dependency being a Kotlin 1.9 module
 okhttp = "4.11.0"

settings.gradle

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