Merge branch '1.11.x' into 1.12.x

shakuzen · shakuzen · commit b08e2ba64c29 · 2024-05-13T13:58:30.000+09:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ aspectjweaver = "1.9.22"
 assertj = "3.24.2"
 awaitility = "4.2.1"
 # legacy SDK
-aws-cloudwatch = "1.12.715"
+aws-cloudwatch = "1.12.720"
 caffeine = "2.9.3"
 cloudwatch2 = "2.21.46"
 colt = "1.2.0"
@@ -72,7 +72,7 @@ slf4j = "1.7.36"
 spectator-atlas = "1.7.12"
 spring = "5.3.34"
 spring-javaformat = "0.0.41"
-testcontainers = "1.19.7"
+testcontainers = "1.19.8"
 tomcat = "8.5.100"
 wavefront = "3.4.3"
 # pinned to avoid issues with shaded slf4j version - see gh-3414
diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gradle.develocity' version '3.17.2'
+    id 'com.gradle.develocity' version '3.17.3'
     id 'io.spring.ge.conventions' version '0.0.17'
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ pluginManagement {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`plugins {`
`8`		`- id 'com.gradle.develocity' version '3.17.2'`
	`8`	`+ id 'com.gradle.develocity' version '3.17.3'`
`9`	`9`	`id 'io.spring.ge.conventions' version '0.0.17'`
`10`	`10`	`id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'`
`11`	`11`	`}`