Skip to content

Commit 128462d

Browse files
Merge branch '1.12.x' into 1.13.x
2 parents 095e420 + 24bb9c2 commit 128462d

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
@@ -51,8 +51,8 @@ jooqOld = "3.14.16"
5151
jooqNew = "3.19.8"
5252
jsr107 = "1.1.1"
5353
jsr305 = "3.0.2"
54-
junit = "5.10.2"
55-
junit-platform = "1.10.2"
54+
junit = "5.10.3"
55+
junit-platform = "1.10.3"
5656
kafka = "2.8.2"
5757
kafka-junit = "4.2.10"
5858
latency-utils = "2.0.3"
@@ -63,19 +63,19 @@ maven-resolver = "1.9.20"
6363
mockito4 = "4.11.0"
6464
mockito5 = "5.11.0"
6565
mongo = "4.11.2"
66-
netty = "4.1.110.Final"
66+
netty = "4.1.111.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.19"
73+
reactor = "2022.0.20"
7474
rest-assured = "5.4.0"
75-
signalfx = "1.0.42"
75+
signalfx = "1.0.43"
7676
slf4j = "1.7.36"
77-
spectator-atlas = "1.7.13"
78-
spring = "5.3.36"
77+
spectator-atlas = "1.7.14"
78+
spring = "5.3.37"
7979
spring-javaformat = "0.0.42"
8080
testcontainers = "1.19.8"
8181
tomcat = "8.5.100"
@@ -176,7 +176,7 @@ logbackLatest = {module = "ch.qos.logback:logback-classic", version.ref = "logba
176176
log4j = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
177177
mavenResolverConnectorBasic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic", version.ref = "maven-resolver" }
178178
mavenResolverTransportHttp = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "maven-resolver" }
179-
mavenResolverProvider = { module = "org.apache.maven:maven-resolver-provider", version = "3.9.7" }
179+
mavenResolverProvider = { module = "org.apache.maven:maven-resolver-provider", version = "3.9.8" }
180180
mockitoCore4 = { module = "org.mockito:mockito-core", version.ref = "mockito4" }
181181
mockitoCore5 = { module = "org.mockito:mockito-core", version.ref = "mockito5" }
182182
mongoSync = { module = "org.mongodb:mongodb-driver-sync", version.ref = "mongo" }

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.4'
8+
id 'com.gradle.develocity' version '3.17.5'
99
id 'io.spring.ge.conventions' version '0.0.17'
1010
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
1111
}

0 commit comments

Comments
 (0)