Skip to content

Commit

Permalink
Merge branch '1.9.x' into 1.12.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jonatan-ivanov committed Jul 3, 2024
2 parents 56eb24b + d0fafcc commit aef5812
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 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.1"
assertj = "3.24.2"
awaitility = "4.2.1"
# legacy SDK
aws-cloudwatch = "1.12.739"
aws-cloudwatch = "1.12.755"
caffeine = "2.9.3"
cloudwatch2 = "2.21.46"
colt = "1.2.0"
Expand Down Expand Up @@ -60,17 +60,17 @@ maven-resolver = "1.9.20"
mockito4 = "4.11.0"
mockito5 = "5.7.0"
mongo = "4.11.2"
netty = "4.1.110.Final"
netty = "4.1.111.Final"
newrelic-api = "5.14.0"
okhttp = "4.11.0"
postgre = "42.6.2"
prometheus = "0.16.0"
reactor = "2022.0.19"
rest-assured = "5.3.2"
signalfx = "1.0.42"
signalfx = "1.0.43"
slf4j = "1.7.36"
spectator-atlas = "1.7.13"
spring = "5.3.36"
spring = "5.3.37"
spring-javaformat = "0.0.42"
testcontainers = "1.19.8"
tomcat = "8.5.100"
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.4'
id 'com.gradle.develocity' version '3.17.5'
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 aef5812

Please sign in to comment.