Merge branch '1.11.x' into 1.12.x

Author: jonatan-ivanov

.circleci/config.yml

@@ -25,7 +25,7 @@ executors:
   machine-executor:
     working_directory: ~/micrometer
     machine:
-      image: ubuntu-2204:2024.01.1
+      image: ubuntu-2204:2024.01.2
 
 commands:
   gradlew-build:

gradle/libs.versions.toml

@@ -5,9 +5,9 @@ archunit = "1.2.1"
 asmForPlugins = "7.3.1"
 aspectjweaver = "1.9.21.1"
 assertj = "3.24.2"
-awaitility = "4.2.0"
+awaitility = "4.2.1"
 # legacy SDK
-aws-cloudwatch = "1.12.674"
+aws-cloudwatch = "1.12.691"
 caffeine = "2.9.3"
 cloudwatch2 = "2.21.46"
 colt = "1.2.0"
@@ -59,20 +59,20 @@ log4j = "2.21.1"
 maven-resolver = "1.9.18"
 mockito = "5.7.0"
 mongo = "4.11.1"
-netty = "4.1.107.Final"
+netty = "4.1.108.Final"
 newrelic-api = "5.14.0"
 okhttp = "4.11.0"
-postgre = "42.6.1"
+postgre = "42.6.2"
 prometheus = "0.16.0"
 reactor = "2022.0.16"
 rest-assured = "5.3.2"
-signalfx = "1.0.39"
+signalfx = "1.0.40"
 slf4j = "1.7.36"
 spectator-atlas = "1.7.8"
-spring = "5.3.32"
+spring = "5.3.33"
 spring-javaformat = "0.0.41"
 testcontainers = "1.19.7"
-tomcat = "8.5.99"
+tomcat = "8.5.100"
 wavefront = "3.4.3"
 # pinned to avoid issues with shaded slf4j version - see gh-3414
 wiremock = "2.33.2"

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 
 plugins {
     id 'com.gradle.enterprise' version '3.16.2'
-    id 'io.spring.ge.conventions' version '0.0.15'
+    id 'io.spring.ge.conventions' version '0.0.16'
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }