Skip to content

Commit

Permalink
Merge branch '1.11.x' into 1.12.x
Browse files Browse the repository at this point in the history
  • Loading branch information
shakuzen committed May 13, 2024
2 parents 8c1538e + a13a46a commit b08e2ba
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down

0 comments on commit b08e2ba

Please sign in to comment.