From ad1344066c9f94a5764dc425acaed6622a54c7cb Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 27 Jan 2025 11:29:12 +0900 Subject: [PATCH 1/3] Upgrade to Gradle Wrapper 8.12.1 (#5823) Signed-off-by: Johnny Lim --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 34ff0ccde5..27c9326731 100644 --- a/build.gradle +++ b/build.gradle @@ -433,7 +433,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 index cea7a793a8..e18bc253b8 100644 --- 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 From 1c07d7966bb3e53b5374593d52c24ac16e4b183b Mon Sep 17 00:00:00 2001 From: Tommy Ludwig <8924140+shakuzen@users.noreply.github.com> Date: Mon, 27 Jan 2025 16:40:47 +0900 Subject: [PATCH 2/3] Bump build JDKs to 21.0.6, 17.0.14, 11.0.26 Resolves gh-5828 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1832c25069..190a892a4e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,21 +7,21 @@ 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: From 56cd839e37f39c600f3c9e12cbe29533f04549ab Mon Sep 17 00:00:00 2001 From: Tommy Ludwig <8924140+shakuzen@users.noreply.github.com> Date: Mon, 27 Jan 2025 16:43:40 +0900 Subject: [PATCH 3/3] Bump build machine image to ubuntu-2404:2024.11.1 Resolves gh-5829 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 190a892a4e..6fe7669754 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ executors: machine-executor: working_directory: ~/micrometer machine: - image: ubuntu-2404:2024.08.1 + image: ubuntu-2404:2024.11.1 commands: gradlew-build: