Skip to content

Commit 4f9bd3c

Browse files
committed
Merge branch '1.9.x' into 1.12.x
2 parents d6fa977 + a09eb1f commit 4f9bd3c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ executors:
1414
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
1515
resource_class: medium+
1616
docker:
17-
- image: cimg/openjdk:17.0.11
17+
- image: cimg/openjdk:17.0.13
1818
circle-jdk11-executor:
1919
working_directory: ~/micrometer
2020
environment:
2121
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
2222
resource_class: medium+
2323
docker:
24-
- image: cimg/openjdk:11.0.22
24+
- image: cimg/openjdk:11.0.25
2525
machine-executor:
2626
working_directory: ~/micrometer
2727
machine:

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ nexusPublishing {
426426
}
427427

428428
wrapper {
429-
gradleVersion = '8.10.2'
429+
gradleVersion = '8.11'
430430
}
431431

432432
defaultTasks 'build'

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)