Skip to content

Commit 2aea183

Browse files
Merge branch '1.9.x' into 1.11.x
2 parents 538d27c + 0e3fa8d commit 2aea183

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ executors:
2525
machine-executor:
2626
working_directory: ~/micrometer
2727
machine:
28-
image: ubuntu-2204:2024.01.1
28+
image: ubuntu-2204:2024.01.2
2929

3030
commands:
3131
gradlew-build:

gradle/libs.versions.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ archunit = "1.1.0"
44
asmForPlugins = "7.3.1"
55
aspectjweaver = "1.8.14"
66
assertj = "3.24.2"
7-
awaitility = "4.2.0"
7+
awaitility = "4.2.1"
88
# legacy SDK
9-
aws-cloudwatch = "1.12.674"
9+
aws-cloudwatch = "1.12.691"
1010
caffeine = "2.9.3"
1111
cloudwatch2 = "2.20.162"
1212
colt = "1.2.0"
@@ -57,20 +57,20 @@ log4j = "2.20.0"
5757
maven-resolver = "1.9.18"
5858
mockito = "5.5.0"
5959
mongo = "4.9.1"
60-
netty = "4.1.107.Final"
60+
netty = "4.1.108.Final"
6161
newrelic-api = "5.14.0"
6262
okhttp = "4.11.0"
6363
postgre = "42.6.1"
6464
prometheus = "0.16.0"
65-
reactor = "2020.0.41"
65+
reactor = "2020.0.42"
6666
rest-assured = "5.3.2"
67-
signalfx = "1.0.39"
67+
signalfx = "1.0.40"
6868
slf4j = "1.7.36"
6969
spectator-atlas = "1.6.11"
70-
spring = "5.3.32"
70+
spring = "5.3.33"
7171
spring-javaformat = "0.0.41"
7272
testcontainers = "1.19.7"
73-
tomcat = "8.5.99"
73+
tomcat = "8.5.100"
7474
wavefront = "3.1.0"
7575
# pinned to avoid issues with shaded slf4j version - see gh-3414
7676
wiremock = "2.33.2"

settings.gradle

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

77
plugins {
88
id 'com.gradle.enterprise' version '3.16.2'
9-
id 'io.spring.ge.conventions' version '0.0.15'
9+
id 'io.spring.ge.conventions' version '0.0.16'
1010
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
1111
}
1212

0 commit comments

Comments
 (0)