Merge branch '1.14.x'

micrometer-metrics · Jan 27, 2025 · ac012fb · ac012fb
2 parents 44b1766 + 4149831
commit ac012fb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,25 +14,25 @@ executors:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:21.0.5
+      - image: cimg/openjdk:21.0.6
   circle-jdk17-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:17.0.13
+      - image: cimg/openjdk:17.0.14
   circle-jdk11-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:11.0.25
+      - image: cimg/openjdk:11.0.26
   machine-executor:
     working_directory: ~/micrometer
     machine:
-      image: ubuntu-2404:2024.08.1
+      image: ubuntu-2404:2024.11.1
 
 commands:
   gradlew-build:

diff --git a/build.gradle b/build.gradle
@@ -438,7 +438,7 @@ nexusPublishing {
 }
 
 wrapper {
-    gradleVersion = '8.12'
+    gradleVersion = '8.12.1'
 }
 
 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.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME