Skip to content

Commit

Permalink
Merge branch '1.13.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
shakuzen committed Oct 1, 2024
2 parents 7aeb29a + 45df021 commit 01adbb8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jackson-databind = "2.17.2"
javax-cache = "1.1.1"
javax-inject = "1"
jaxb = "2.3.1"
jetty9 = "9.4.55.v20240627"
jetty9 = "9.4.56.v20240826"
jetty11 = "11.0.16"
jetty12 = "12.0.6"
jersey2 = "2.45"
Expand All @@ -63,8 +63,8 @@ log4j = "2.23.1"
maven-resolver = "1.9.22"
mockito4 = "4.11.0"
mockito5 = "5.11.0"
mongo = "4.11.3"
netty = "4.1.112.Final"
mongo = "4.11.4"
netty = "4.1.113.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"
Expand All @@ -73,9 +73,9 @@ prometheus = "1.3.1"
prometheusSimpleClient = "0.16.0"
reactor = "2022.0.22"
rest-assured = "5.5.0"
signalfx = "1.0.45"
signalfx = "1.0.46"
slf4j = "1.7.36"
spectator-atlas = "1.7.19"
spectator-atlas = "1.7.21"
spring = "5.3.36"
spring-javaformat = "0.0.43"
testcontainers = "1.20.1"
Expand Down Expand Up @@ -207,7 +207,7 @@ spring-context = { module = "org.springframework:spring-context", version.ref =
spring-core = { module = "org.springframework:spring-core", version.ref = "spring" }
spring-cloud = { module = "org.springframework.cloud:spring-cloud-dependencies", version = "2021.0.9" }
spring-javaformatCheckstyle = { module = "io.spring.javaformat:spring-javaformat-checkstyle", version.ref = "spring-javaformat" }
systemStubsJupiter = { module = "uk.org.webcompere:system-stubs-jupiter", version = "2.1.6" }
systemStubsJupiter = { module = "uk.org.webcompere:system-stubs-jupiter", version = "2.1.7" }
testcontainers-junitJupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
testcontainers-kafka = { module = "org.testcontainers:kafka", version.ref = "testcontainers" }
testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainers" }
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pluginManagement {

plugins {
id 'com.gradle.develocity' version '3.18'
id 'io.spring.develocity.conventions' version '0.0.20'
id 'io.spring.develocity.conventions' version '0.0.21'
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
}

Expand Down

0 comments on commit 01adbb8

Please sign in to comment.