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 Jul 3, 2024
2 parents 095e420 + 24bb9c2 commit 128462d
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 @@ -51,8 +51,8 @@ jooqOld = "3.14.16"
jooqNew = "3.19.8"
jsr107 = "1.1.1"
jsr305 = "3.0.2"
junit = "5.10.2"
junit-platform = "1.10.2"
junit = "5.10.3"
junit-platform = "1.10.3"
kafka = "2.8.2"
kafka-junit = "4.2.10"
latency-utils = "2.0.3"
Expand All @@ -63,19 +63,19 @@ maven-resolver = "1.9.20"
mockito4 = "4.11.0"
mockito5 = "5.11.0"
mongo = "4.11.2"
netty = "4.1.110.Final"
netty = "4.1.111.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.19"
reactor = "2022.0.20"
rest-assured = "5.4.0"
signalfx = "1.0.42"
signalfx = "1.0.43"
slf4j = "1.7.36"
spectator-atlas = "1.7.13"
spring = "5.3.36"
spectator-atlas = "1.7.14"
spring = "5.3.37"
spring-javaformat = "0.0.42"
testcontainers = "1.19.8"
tomcat = "8.5.100"
Expand Down Expand Up @@ -176,7 +176,7 @@ logbackLatest = {module = "ch.qos.logback:logback-classic", version.ref = "logba
log4j = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
mavenResolverConnectorBasic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic", version.ref = "maven-resolver" }
mavenResolverTransportHttp = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "maven-resolver" }
mavenResolverProvider = { module = "org.apache.maven:maven-resolver-provider", version = "3.9.7" }
mavenResolverProvider = { module = "org.apache.maven:maven-resolver-provider", version = "3.9.8" }
mockitoCore4 = { module = "org.mockito:mockito-core", version.ref = "mockito4" }
mockitoCore5 = { module = "org.mockito:mockito-core", version.ref = "mockito5" }
mongoSync = { module = "org.mongodb:mongodb-driver-sync", version.ref = "mongo" }
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 128462d

Please sign in to comment.