Skip to content

Commit 39783aa

Browse files
Merge branch '1.12.x' into 1.13.x
2 parents d0c90b8 + 1781a32 commit 39783aa

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

gradle/libs.versions.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ archunit = "1.3.0"
55
asmForPlugins = "7.3.1"
66
aspectjweaver = "1.9.22.1"
77
assertj = "3.25.3"
8-
awaitility = "4.2.1"
8+
awaitility = "4.2.2"
99
caffeine = "2.9.3"
1010
cloudwatch2 = "2.25.70"
1111
colt = "1.2.0"
@@ -39,7 +39,7 @@ jackson-databind = "2.17.1"
3939
javax-cache = "1.1.1"
4040
javax-inject = "1"
4141
jaxb = "2.3.1"
42-
jetty9 = "9.4.54.v20240208"
42+
jetty9 = "9.4.55.v20240627"
4343
jetty11 = "11.0.16"
4444
jetty12 = "12.0.6"
4545
jersey2 = "2.43"
@@ -59,22 +59,22 @@ latency-utils = "2.0.3"
5959
logback12 = "1.2.13"
6060
logback-latest = "1.5.3"
6161
log4j = "2.23.1"
62-
maven-resolver = "1.9.20"
62+
maven-resolver = "1.9.22"
6363
mockito4 = "4.11.0"
6464
mockito5 = "5.11.0"
65-
mongo = "4.11.2"
66-
netty = "4.1.111.Final"
65+
mongo = "4.11.3"
66+
netty = "4.1.112.Final"
6767
newrelic-api = "5.14.0"
6868
# Kotlin 1.7 sample will fail from OkHttp 4.12.0 due to okio dependency being a Kotlin 1.9 module
6969
okhttp = "4.11.0"
7070
postgre = "42.7.3"
7171
prometheus = "1.2.1"
7272
prometheusSimpleClient = "0.16.0"
73-
reactor = "2022.0.20"
73+
reactor = "2022.0.21"
7474
rest-assured = "5.4.0"
75-
signalfx = "1.0.43"
75+
signalfx = "1.0.44"
7676
slf4j = "1.7.36"
77-
spectator-atlas = "1.7.14"
77+
spectator-atlas = "1.7.18"
7878
spring = "5.3.37"
7979
spring-javaformat = "0.0.42"
8080
testcontainers = "1.19.8"

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pluginManagement {
55
}
66

77
plugins {
8-
id 'com.gradle.develocity' version '3.17.5'
8+
id 'com.gradle.develocity' version '3.17.6'
99
id 'io.spring.develocity.conventions' version '0.0.19'
1010
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
1111
}

0 commit comments

Comments
 (0)