Skip to content

Commit

Permalink
Merge branch '1.12.x' into 1.13.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jonatan-ivanov committed Aug 9, 2024
2 parents d0c90b8 + 1781a32 commit 39783aa
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ archunit = "1.3.0"
asmForPlugins = "7.3.1"
aspectjweaver = "1.9.22.1"
assertj = "3.25.3"
awaitility = "4.2.1"
awaitility = "4.2.2"
caffeine = "2.9.3"
cloudwatch2 = "2.25.70"
colt = "1.2.0"
Expand Down Expand Up @@ -39,7 +39,7 @@ jackson-databind = "2.17.1"
javax-cache = "1.1.1"
javax-inject = "1"
jaxb = "2.3.1"
jetty9 = "9.4.54.v20240208"
jetty9 = "9.4.55.v20240627"
jetty11 = "11.0.16"
jetty12 = "12.0.6"
jersey2 = "2.43"
Expand All @@ -59,22 +59,22 @@ latency-utils = "2.0.3"
logback12 = "1.2.13"
logback-latest = "1.5.3"
log4j = "2.23.1"
maven-resolver = "1.9.20"
maven-resolver = "1.9.22"
mockito4 = "4.11.0"
mockito5 = "5.11.0"
mongo = "4.11.2"
netty = "4.1.111.Final"
mongo = "4.11.3"
netty = "4.1.112.Final"
newrelic-api = "5.14.0"
# Kotlin 1.7 sample will fail from OkHttp 4.12.0 due to okio dependency being a Kotlin 1.9 module
okhttp = "4.11.0"
postgre = "42.7.3"
prometheus = "1.2.1"
prometheusSimpleClient = "0.16.0"
reactor = "2022.0.20"
reactor = "2022.0.21"
rest-assured = "5.4.0"
signalfx = "1.0.43"
signalfx = "1.0.44"
slf4j = "1.7.36"
spectator-atlas = "1.7.14"
spectator-atlas = "1.7.18"
spring = "5.3.37"
spring-javaformat = "0.0.42"
testcontainers = "1.19.8"
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.5'
id 'com.gradle.develocity' version '3.17.6'
id 'io.spring.develocity.conventions' version '0.0.19'
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
}
Expand Down

0 comments on commit 39783aa

Please sign in to comment.