From e667fffe6efa44d6efb4b385d77283dc4713bd92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 16:24:12 +0900 Subject: [PATCH 01/27] Bump io.micrometer:micrometer-bom from 1.13.13 to 1.13.14 (#1036) Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.13.13 to 1.13.14. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.13...v1.13.14) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-bom dependency-version: 1.13.14 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7a2252f9..7594c29b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -micrometer = "1.13.13" +micrometer = "1.13.14" micrometerContextPropagation="1.1.3" junit = "5.10.5" javaxServlet="4.0.1" From d9ff234371b088b0419e26f1b9028e4953f546ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 02:22:08 -0700 Subject: [PATCH 02/27] Bump io.micrometer:micrometer-bom from 1.14.6 to 1.14.7 (#1037) Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.14.6 to 1.14.7. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.14.6...v1.14.7) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-bom dependency-version: 1.14.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d69d773a..c5b01d29 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -micrometer = "1.14.6" +micrometer = "1.14.7" micrometerContextPropagation="1.1.3" junit = "5.11.4" javaxServlet="4.0.1" From bc602cc6bd161e2cb0c2264b5054075f0f99b3eb Mon Sep 17 00:00:00 2001 From: Tommy Ludwig <8924140+shakuzen@users.noreply.github.com> Date: Tue, 13 May 2025 11:55:40 +0900 Subject: [PATCH 03/27] Use run instead of deploy in CircleCI config `deploy` has been deprecated and does the same thing as `run` anyway. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b53af70d..13a55d5e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -84,7 +84,7 @@ jobs: - checkout - restore_cache: key: gradle-dependencies-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }} - - deploy: + - run: name: Deployment command: sh ./gradle/deploy.sh From afb45bf8567cde9ddc9382c897d312e2afe0fcaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 May 2025 23:26:31 +0900 Subject: [PATCH 04/27] Bump io.spring.javaformat:spring-javaformat-checkstyle (#1040) Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.43 to 0.0.44. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.43...v0.0.44) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.44 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7594c29b..dd88944f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ bravePropagationW3c = "0.2.0" zipkinReporterBom = "3.4.3" reactorBom = "2022.0.22" asmForPlugins = "7.3.1" -javaFormatForPlugins = "0.0.43" +javaFormatForPlugins = "0.0.44" jsr305 = "3.0.2" aspectjweaver = "1.9.24" spring = "5.3.39" From d46ababe3e64c2815eb5c21b86043fffea09b6f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 May 2025 07:34:41 -0700 Subject: [PATCH 05/27] Bump io.spring.javaformat:spring-javaformat-checkstyle (#1043) Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.43 to 0.0.44. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.43...v0.0.44) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.44 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c5b01d29..6f24583b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ bravePropagationW3c = "0.2.0" zipkinReporterBom = "3.4.3" reactorBom = "2022.0.22" asmForPlugins = "7.3.1" -javaFormatForPlugins = "0.0.43" +javaFormatForPlugins = "0.0.44" jsr305 = "3.0.2" aspectjweaver = "1.9.24" spring = "5.3.39" From a555496592cbe0dd31950e524ae198864b0eab9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 May 2025 14:47:33 +0000 Subject: [PATCH 06/27] Bump io.spring.javaformat:spring-javaformat-gradle-plugin (#1048) Bumps [io.spring.javaformat:spring-javaformat-gradle-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.43 to 0.0.45. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.43...v0.0.45) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin dependency-version: 0.0.45 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6f24583b..5c1f16c3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -72,7 +72,7 @@ plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", ve plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "12.1.6" } plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" } plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" } -plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.43" } +plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.45" } plugin-jmh = { module = "me.champeau.jmh:jmh-gradle-plugin", version = "0.7.3" } plugin-spring-antora = { module = "io.spring.gradle.antora:spring-antora-plugin", version = "0.0.1" } plugin-antora = { module = "org.antora:gradle-antora-plugin", version = "1.0.0" } From cd26b57a5d6b449cd1e6a4ab48dd404941692028 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 May 2025 14:52:23 +0000 Subject: [PATCH 07/27] Bump io.spring.javaformat:spring-javaformat-checkstyle (#1049) Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.44 to 0.0.45. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.44...v0.0.45) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.45 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5c1f16c3..851b36cf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ bravePropagationW3c = "0.2.0" zipkinReporterBom = "3.4.3" reactorBom = "2022.0.22" asmForPlugins = "7.3.1" -javaFormatForPlugins = "0.0.44" +javaFormatForPlugins = "0.0.45" jsr305 = "3.0.2" aspectjweaver = "1.9.24" spring = "5.3.39" From 8d7113f305ebbbc2f418cbeefcacce4bd1e50492 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 May 2025 00:05:21 +0900 Subject: [PATCH 08/27] Bump io.spring.javaformat:spring-javaformat-checkstyle (#1052) Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.44 to 0.0.45. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.44...v0.0.45) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.45 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dd88944f..c1598d72 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ bravePropagationW3c = "0.2.0" zipkinReporterBom = "3.4.3" reactorBom = "2022.0.22" asmForPlugins = "7.3.1" -javaFormatForPlugins = "0.0.44" +javaFormatForPlugins = "0.0.45" jsr305 = "3.0.2" aspectjweaver = "1.9.24" spring = "5.3.39" From cb4b9115da7cd5f31ac70cabe7f300183fe2f93f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 May 2025 15:09:31 +0000 Subject: [PATCH 09/27] Bump io.spring.javaformat:spring-javaformat-gradle-plugin (#1053) Bumps [io.spring.javaformat:spring-javaformat-gradle-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.43 to 0.0.45. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.43...v0.0.45) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin dependency-version: 0.0.45 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c1598d72..094730d3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -72,7 +72,7 @@ plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", ve plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "12.1.6" } plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" } plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" } -plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.43" } +plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.45" } plugin-jmh = { module = "me.champeau.jmh:jmh-gradle-plugin", version = "0.7.3" } plugin-spring-antora = { module = "io.spring.gradle.antora:spring-antora-plugin", version = "0.0.1" } plugin-antora = { module = "org.antora:gradle-antora-plugin", version = "1.0.0" } From c2dff32131df7669a96257d90a1b48ba5172891d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 00:18:31 -0700 Subject: [PATCH 10/27] Bump io.spring.javaformat:spring-javaformat-gradle-plugin (#1056) Bumps [io.spring.javaformat:spring-javaformat-gradle-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.43 to 0.0.45. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.43...v0.0.45) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin dependency-version: 0.0.45 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9e886845..b8f6223e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -68,7 +68,7 @@ plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", ve plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "12.1.6" } plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" } plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" } -plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.43" } +plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.45" } plugin-jmh = { module = "me.champeau.jmh:jmh-gradle-plugin", version = "0.7.3" } plugin-spring-antora = { module = "io.spring.gradle.antora:spring-antora-plugin", version = "0.0.1" } plugin-antora = { module = "org.antora:gradle-antora-plugin", version = "1.0.0" } From 44ec5585b5d1a605791d08abf08c556cc29a0c43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 16:18:37 +0900 Subject: [PATCH 11/27] Bump io.spring.javaformat:spring-javaformat-checkstyle (#1055) Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.43 to 0.0.45. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.43...v0.0.45) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.45 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b8f6223e..b766c225 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,7 +21,7 @@ bravePropagationW3c = "0.2.0" zipkinReporterBom = "3.5.0" reactorBom = "2022.0.22" asmForPlugins = "7.3.1" -javaFormatForPlugins = "0.0.43" +javaFormatForPlugins = "0.0.45" jsr305 = "3.0.2" aspectjweaver = "1.9.24" spring = "5.3.39" From e25aaabdc0de7ebc708f5930cd84a10cd8183d6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 May 2025 23:37:00 +0900 Subject: [PATCH 12/27] Bump io.zipkin.reporter2:zipkin-reporter-bom from 3.5.0 to 3.5.1 (#1066) Bumps [io.zipkin.reporter2:zipkin-reporter-bom](https://github.com/openzipkin/zipkin-reporter-java) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/openzipkin/zipkin-reporter-java/releases) - [Changelog](https://github.com/openzipkin/zipkin-reporter-java/blob/master/RELEASE.md) - [Commits](https://github.com/openzipkin/zipkin-reporter-java/compare/3.5.0...3.5.1) --- updated-dependencies: - dependency-name: io.zipkin.reporter2:zipkin-reporter-bom dependency-version: 3.5.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b766c225..af1d2fd3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ wiremock = "3.0.1" testcontainers = "1.21.0" braveBom = "6.2.0" bravePropagationW3c = "0.2.0" -zipkinReporterBom = "3.5.0" +zipkinReporterBom = "3.5.1" reactorBom = "2022.0.22" asmForPlugins = "7.3.1" javaFormatForPlugins = "0.0.45" From 8fb26ec41261b3b4cff4e604c87e293d364b1c8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 May 2025 23:37:46 +0900 Subject: [PATCH 13/27] Bump testcontainers from 1.21.0 to 1.21.1 (#1065) Bumps `testcontainers` from 1.21.0 to 1.21.1. Updates `org.testcontainers:testcontainers` from 1.21.0 to 1.21.1 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.21.0...1.21.1) Updates `org.testcontainers:junit-jupiter` from 1.21.0 to 1.21.1 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.21.0...1.21.1) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-version: 1.21.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.testcontainers:junit-jupiter dependency-version: 1.21.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index af1d2fd3..d4c3c15a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ assertj = "3.27.3" awaitility = "4.3.0" mockito = "5.17.0" wiremock = "3.0.1" -testcontainers = "1.21.0" +testcontainers = "1.21.1" braveBom = "6.2.0" bravePropagationW3c = "0.2.0" zipkinReporterBom = "3.5.1" From c3a62f32907c8fb13faee2d83c32fc13c7cee8b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 07:28:07 -0700 Subject: [PATCH 14/27] Bump io.spring.javaformat:spring-javaformat-gradle-plugin (#1070) Bumps [io.spring.javaformat:spring-javaformat-gradle-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.45 to 0.0.46. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.45...v0.0.46) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin dependency-version: 0.0.46 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 851b36cf..de5f01e5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -72,7 +72,7 @@ plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", ve plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "12.1.6" } plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" } plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" } -plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.45" } +plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.46" } plugin-jmh = { module = "me.champeau.jmh:jmh-gradle-plugin", version = "0.7.3" } plugin-spring-antora = { module = "io.spring.gradle.antora:spring-antora-plugin", version = "0.0.1" } plugin-antora = { module = "org.antora:gradle-antora-plugin", version = "1.0.0" } From 3502bba1970f2d69387bdd89c6bfe937174e09d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 23:28:27 +0900 Subject: [PATCH 15/27] Bump io.spring.develocity.conventions from 0.0.22 to 0.0.23 (#1071) Bumps [io.spring.develocity.conventions](https://github.com/spring-io/develocity-conventions) from 0.0.22 to 0.0.23. - [Release notes](https://github.com/spring-io/develocity-conventions/releases) - [Commits](https://github.com/spring-io/develocity-conventions/compare/v0.0.22...v0.0.23) --- updated-dependencies: - dependency-name: io.spring.develocity.conventions dependency-version: 0.0.23 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 412946b0..38d7fb91 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { plugins { id 'com.gradle.develocity' version '3.18.2' - id 'io.spring.develocity.conventions' version '0.0.22' + id 'io.spring.develocity.conventions' version '0.0.23' id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0' } From 6ac3b7c5202b384928eb3b44cefb80b02441faab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 07:28:53 -0700 Subject: [PATCH 16/27] Bump io.spring.javaformat:spring-javaformat-checkstyle (#1072) Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.45 to 0.0.46. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.45...v0.0.46) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.46 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index de5f01e5..49af2204 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ bravePropagationW3c = "0.2.0" zipkinReporterBom = "3.4.3" reactorBom = "2022.0.22" asmForPlugins = "7.3.1" -javaFormatForPlugins = "0.0.45" +javaFormatForPlugins = "0.0.46" jsr305 = "3.0.2" aspectjweaver = "1.9.24" spring = "5.3.39" From c8d5c52528c6c8d342ade0299d1e56b5c1cd98f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 23:40:51 +0900 Subject: [PATCH 17/27] Bump io.spring.develocity.conventions from 0.0.22 to 0.0.23 (#1074) Bumps [io.spring.develocity.conventions](https://github.com/spring-io/develocity-conventions) from 0.0.22 to 0.0.23. - [Release notes](https://github.com/spring-io/develocity-conventions/releases) - [Commits](https://github.com/spring-io/develocity-conventions/compare/v0.0.22...v0.0.23) --- updated-dependencies: - dependency-name: io.spring.develocity.conventions dependency-version: 0.0.23 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index a5e1b904..5a3f5b53 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { plugins { id 'com.gradle.develocity' version '3.19.2' - id 'io.spring.develocity.conventions' version '0.0.22' + id 'io.spring.develocity.conventions' version '0.0.23' id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0' } From 2da3a9bb10014895b63c17dc1443bb4b58857855 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 23:40:58 +0900 Subject: [PATCH 18/27] Bump io.spring.javaformat:spring-javaformat-checkstyle (#1073) Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.45 to 0.0.46. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.45...v0.0.46) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.46 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d4c3c15a..81a593ae 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,7 +21,7 @@ bravePropagationW3c = "0.2.0" zipkinReporterBom = "3.5.1" reactorBom = "2022.0.22" asmForPlugins = "7.3.1" -javaFormatForPlugins = "0.0.45" +javaFormatForPlugins = "0.0.46" jsr305 = "3.0.2" aspectjweaver = "1.9.24" spring = "5.3.39" From 1c8e14fda01392a8d9aba448407e7fdf58d38bc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 07:41:09 -0700 Subject: [PATCH 19/27] Bump io.spring.javaformat:spring-javaformat-gradle-plugin (#1075) Bumps [io.spring.javaformat:spring-javaformat-gradle-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.45 to 0.0.46. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.45...v0.0.46) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin dependency-version: 0.0.46 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 81a593ae..aa462569 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -68,7 +68,7 @@ plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", ve plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "12.1.6" } plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" } plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" } -plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.45" } +plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.46" } plugin-jmh = { module = "me.champeau.jmh:jmh-gradle-plugin", version = "0.7.3" } plugin-spring-antora = { module = "io.spring.gradle.antora:spring-antora-plugin", version = "0.0.1" } plugin-antora = { module = "org.antora:gradle-antora-plugin", version = "1.0.0" } From 66b1748a22c8700d4ee9be51998bf8b6dc08639f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 00:08:58 +0900 Subject: [PATCH 20/27] Bump io.spring.javaformat:spring-javaformat-checkstyle (#1079) Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.45 to 0.0.46. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.45...v0.0.46) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.46 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 094730d3..59512cae 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ bravePropagationW3c = "0.2.0" zipkinReporterBom = "3.4.3" reactorBom = "2022.0.22" asmForPlugins = "7.3.1" -javaFormatForPlugins = "0.0.45" +javaFormatForPlugins = "0.0.46" jsr305 = "3.0.2" aspectjweaver = "1.9.24" spring = "5.3.39" From 443efb30c3a7caea96f3072f9dc628acee2170dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 00:09:06 +0900 Subject: [PATCH 21/27] Bump io.spring.javaformat:spring-javaformat-gradle-plugin (#1081) Bumps [io.spring.javaformat:spring-javaformat-gradle-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.45 to 0.0.46. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.45...v0.0.46) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin dependency-version: 0.0.46 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 59512cae..56b7a284 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -72,7 +72,7 @@ plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", ve plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "12.1.6" } plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" } plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" } -plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.45" } +plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.46" } plugin-jmh = { module = "me.champeau.jmh:jmh-gradle-plugin", version = "0.7.3" } plugin-spring-antora = { module = "io.spring.gradle.antora:spring-antora-plugin", version = "0.0.1" } plugin-antora = { module = "org.antora:gradle-antora-plugin", version = "1.0.0" } From 27a3477bf6545af244fefc01630fb2a4c2620920 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 00:09:18 +0900 Subject: [PATCH 22/27] Bump io.spring.develocity.conventions from 0.0.22 to 0.0.23 (#1080) Bumps [io.spring.develocity.conventions](https://github.com/spring-io/develocity-conventions) from 0.0.22 to 0.0.23. - [Release notes](https://github.com/spring-io/develocity-conventions/releases) - [Commits](https://github.com/spring-io/develocity-conventions/compare/v0.0.22...v0.0.23) --- updated-dependencies: - dependency-name: io.spring.develocity.conventions dependency-version: 0.0.23 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 412946b0..38d7fb91 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { plugins { id 'com.gradle.develocity' version '3.18.2' - id 'io.spring.develocity.conventions' version '0.0.22' + id 'io.spring.develocity.conventions' version '0.0.23' id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0' } From e72dc6bd1b2103429aab60d4fa174941258c3732 Mon Sep 17 00:00:00 2001 From: Amit Sinha <43842969+amitsinha11@users.noreply.github.com> Date: Thu, 5 Jun 2025 13:35:26 +0530 Subject: [PATCH 23/27] fix: preserve new baggage values in context on key conflict (#1061) Existing keys would always remain when trying to overwrite them by appending new values. This fixes the behavior to overwrite existing keys. Signed-off-by: Amit Sinha Co-authored-by: Amit Sinha --- .../reactor/ReactorBaggage.java | 5 +- .../reactor/ReactorBaggageTests.java | 87 +++++++++++++++++++ 2 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 micrometer-tracing/src/test/java/io/micrometer/tracing/contextpropagation/reactor/ReactorBaggageTests.java diff --git a/micrometer-tracing/src/main/java/io/micrometer/tracing/contextpropagation/reactor/ReactorBaggage.java b/micrometer-tracing/src/main/java/io/micrometer/tracing/contextpropagation/reactor/ReactorBaggage.java index 523c218c..215998f6 100644 --- a/micrometer-tracing/src/main/java/io/micrometer/tracing/contextpropagation/reactor/ReactorBaggage.java +++ b/micrometer-tracing/src/main/java/io/micrometer/tracing/contextpropagation/reactor/ReactorBaggage.java @@ -59,10 +59,11 @@ public static Function append(Map baggage) { private static Context append(Context context, Map baggage) { BaggageToPropagate baggageToPropagate = context.getOrDefault(ObservationAwareBaggageThreadLocalAccessor.KEY, null); - Map mergedBaggage = new HashMap<>(baggage); + Map mergedBaggage = new HashMap<>(); if (baggageToPropagate != null) { mergedBaggage.putAll(baggageToPropagate.getBaggage()); } + mergedBaggage.putAll(baggage); BaggageToPropagate merged = new BaggageToPropagate(mergedBaggage); return context.put(ObservationAwareBaggageThreadLocalAccessor.KEY, merged); } @@ -71,10 +72,10 @@ private static Context append(Context context, String key, String value) { BaggageToPropagate baggageToPropagate = context.getOrDefault(ObservationAwareBaggageThreadLocalAccessor.KEY, null); Map mergedBaggage = new HashMap<>(); - mergedBaggage.put(key, value); if (baggageToPropagate != null) { mergedBaggage.putAll(baggageToPropagate.getBaggage()); } + mergedBaggage.put(key, value); BaggageToPropagate merged = new BaggageToPropagate(mergedBaggage); return context.put(ObservationAwareBaggageThreadLocalAccessor.KEY, merged); } diff --git a/micrometer-tracing/src/test/java/io/micrometer/tracing/contextpropagation/reactor/ReactorBaggageTests.java b/micrometer-tracing/src/test/java/io/micrometer/tracing/contextpropagation/reactor/ReactorBaggageTests.java new file mode 100644 index 00000000..a418cd97 --- /dev/null +++ b/micrometer-tracing/src/test/java/io/micrometer/tracing/contextpropagation/reactor/ReactorBaggageTests.java @@ -0,0 +1,87 @@ +/** + * Copyright 2025 the original author or authors. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package io.micrometer.tracing.contextpropagation.reactor; + +import io.micrometer.tracing.contextpropagation.BaggageToPropagate; +import io.micrometer.tracing.contextpropagation.ObservationAwareBaggageThreadLocalAccessor; +import org.junit.jupiter.api.Test; +import reactor.util.context.Context; + +import java.util.HashMap; +import java.util.Map; + +import static org.assertj.core.api.BDDAssertions.then; + +class ReactorBaggageTests { + + @Test + void should_append_single_baggage_entry_to_context() { + Context updatedContext = ReactorBaggage.append("foo", "bar").apply(Context.empty()); + + BaggageToPropagate baggage = updatedContext.get(ObservationAwareBaggageThreadLocalAccessor.KEY); + then(baggage).isNotNull(); + then(baggage.getBaggage()).hasSize(1); + then(baggage.getBaggage()).containsEntry("foo", "bar"); + } + + @Test + void should_append_multiple_baggage_entries_to_context() { + Map baggageEntries = new HashMap<>(); + baggageEntries.put("foo", "bar"); + baggageEntries.put("baz", "bar2"); + + Context updatedContext = ReactorBaggage.append(baggageEntries).apply(Context.empty()); + + BaggageToPropagate baggage = updatedContext.get(ObservationAwareBaggageThreadLocalAccessor.KEY); + then(baggage).isNotNull(); + then(baggage.getBaggage()).hasSize(2); + then(baggage.getBaggage()).containsExactlyInAnyOrderEntriesOf(baggageEntries); + } + + @Test + void should_merge_existing_baggage_with_new_entries() { + Map initialBaggage = new HashMap<>(); + initialBaggage.put("foo", "bar"); + initialBaggage.put("baz", "bar2"); + Context context = Context.of(ObservationAwareBaggageThreadLocalAccessor.KEY, + new BaggageToPropagate(initialBaggage)); + + Map newBaggage = new HashMap<>(); + newBaggage.put("foo", "bar1"); + + Context updatedContext = ReactorBaggage.append(newBaggage).apply(context); + + BaggageToPropagate baggage = updatedContext.get(ObservationAwareBaggageThreadLocalAccessor.KEY); + then(baggage).isNotNull(); + then(baggage.getBaggage()).hasSize(2); + then(baggage.getBaggage()).containsEntry("foo", "bar1").containsEntry("baz", "bar2"); + } + + @Test + void should_merge_existing_baggage_with_single_entry() { + Map initialBaggage = new HashMap<>(); + initialBaggage.put("foo", "bar"); + initialBaggage.put("baz", "bar2"); + Context context = Context.of(ObservationAwareBaggageThreadLocalAccessor.KEY, + new BaggageToPropagate(initialBaggage)); + + Context updatedContext = ReactorBaggage.append("foo", "bar1").apply(context); + + BaggageToPropagate baggage = updatedContext.get(ObservationAwareBaggageThreadLocalAccessor.KEY); + then(baggage).isNotNull(); + then(baggage.getBaggage()).hasSize(2); + then(baggage.getBaggage()).containsEntry("foo", "bar1").containsEntry("baz", "bar2"); + } + +} From 3e11deaca1f73f61c73004f2749bd791b814c27d Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Thu, 5 Jun 2025 15:09:58 -0700 Subject: [PATCH 24/27] Migrate to Portal OSSRH Staging API The Sonatype OSSRH (OSS Repository Hosting) publishing service [will be discontinued on 2025-06-30][1] so we need to migrate either to the [Central Portal Publisher Service][2] or to the [Portal OSSRH Staging API][3]. The former is a completely new API, the latter is a migratory/shim (partial reimplementation of the old) API to enable users who are using existing plugins to have a smooth migration to the Central Publisher Portal. The [gradle-nexus/publish-plugin][4] is [supported][5] by the [Portal OSSRH Staging API][3] so we can use that until the plugin supports the new Central Portal Publisher Service: gradle-nexus/publish-plugin#330 [1]: https://central.sonatype.org/news/20250326_ossrh_sunset/ [2]: https://central.sonatype.org/publish/publish-portal-guide/ [3]: https://central.sonatype.org/publish/publish-portal-ossrh-staging-api/ [4]: https://github.com/gradle-nexus/publish-plugin/ [5]: https://central.sonatype.org/publish/publish-portal-ossrh-staging-api/#plugins-tested-for-compatibility Closes gh-1083 See gradle-nexus/publish-plugin#330 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f9dc56c1..e2984bfb 100644 --- a/build.gradle +++ b/build.gradle @@ -327,7 +327,7 @@ subprojects { nexusPublishing { repositories { mavenCentral { - nexusUrl.set(uri('https://s01.oss.sonatype.org/service/local/')) + nexusUrl.set(uri('https://ossrh-staging-api.central.sonatype.com/service/local/')) snapshotRepositoryUrl.set(uri('https://repo.spring.io/snapshot/')) // not used but necessary for the plugin username = findProperty('MAVEN_CENTRAL_USER') password = findProperty('MAVEN_CENTRAL_PASSWORD') From 630836f24463323bc8ec6defbe7dd336b179ce97 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Fri, 6 Jun 2025 16:29:14 -0700 Subject: [PATCH 25/27] Migrate to gradle/actions/wrapper-validation@v4 Closes gh-1084 --- .github/workflows/gradle-wrapper-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index cc9a18a8..a88545e7 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -7,4 +7,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4.1.5 - - uses: gradle/actions/wrapper-validation@v3 + - uses: gradle/actions/wrapper-validation@v4 From 419a271734bcb860bffbe39c046bd57b9f1c7e95 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Fri, 6 Jun 2025 16:30:19 -0700 Subject: [PATCH 26/27] Upgrade to Gradle Wrapper 8.14.2 Closes gh-1085 --- 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 e2984bfb..1af8bbb9 100644 --- a/build.gradle +++ b/build.gradle @@ -336,7 +336,7 @@ nexusPublishing { } wrapper { - gradleVersion = '8.14' + gradleVersion = '8.14.2' } defaultTasks 'build' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c83..ff23a68d 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.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 03d2ed5102202d379bd29933fd3b43af77cbe98a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jun 2025 13:25:17 -0700 Subject: [PATCH 27/27] Bump io.micrometer:micrometer-bom from 1.15.0 to 1.15.1 (#1090) Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.15.0 to 1.15.1. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.15.0...v1.15.1) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-bom dependency-version: 1.15.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa462569..207aecad 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -micrometer = "1.15.0" +micrometer = "1.15.1" junit = "5.12.2" javaxServlet="4.0.1" jmh="1.37"