Merge branch '1.9.x' into 1.12.x

micrometer-metrics · Nov 12, 2024 · 4f9bd3c · 4f9bd3c
2 parents d6fa977 + a09eb1f
commit 4f9bd3c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,14 +14,14 @@ executors:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:17.0.11
+      - image: cimg/openjdk:17.0.13
   circle-jdk11-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:11.0.22
+      - image: cimg/openjdk:11.0.25
   machine-executor:
     working_directory: ~/micrometer
     machine:

diff --git a/build.gradle b/build.gradle
@@ -426,7 +426,7 @@ nexusPublishing {
 }
 
 wrapper {
-    gradleVersion = '8.10.2'
+    gradleVersion = '8.11'
 }
 
 defaultTasks 'build'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME