From 4a4bbc67e8e32af1f0387d0a82b0db84d7484f84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 03:47:31 +0000 Subject: [PATCH 1/2] Bump io.micrometer:micrometer-observation from 1.12.2 to 1.12.3 Bumps [io.micrometer:micrometer-observation](https://github.com/micrometer-metrics/micrometer) from 1.12.2 to 1.12.3. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.2...v1.12.3) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-observation dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- 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 e18fa2b7d6..a050fa6fe5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,7 +26,7 @@ com-squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebser com-squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "com-squareup-okhttp3" } com-unboundid-unboundid-ldapsdk = "com.unboundid:unboundid-ldapsdk:6.0.11" commons-collections = "commons-collections:commons-collections:3.2.2" -io-micrometer-micrometer-observation = "io.micrometer:micrometer-observation:1.12.2" +io-micrometer-micrometer-observation = "io.micrometer:micrometer-observation:1.12.3" io-mockk = "io.mockk:mockk:1.13.9" io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2023.0.2" io-rsocket-rsocket-bom = { module = "io.rsocket:rsocket-bom", version.ref = "io-rsocket" } From 731cd6131b57e1d42333383d7065c2b01381942f Mon Sep 17 00:00:00 2001 From: Marcus Hert Da Coregio Date: Tue, 13 Feb 2024 10:45:08 -0300 Subject: [PATCH 2/2] Do not try to run trigger dependabot automerge workflow in PRs Issue gh-14535 --- .github/workflows/trigger-dependabot-auto-merge-forward.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-dependabot-auto-merge-forward.yml b/.github/workflows/trigger-dependabot-auto-merge-forward.yml index fa80aafc7a..08be3c35ed 100644 --- a/.github/workflows/trigger-dependabot-auto-merge-forward.yml +++ b/.github/workflows/trigger-dependabot-auto-merge-forward.yml @@ -9,7 +9,7 @@ jobs: trigger-worflow: name: Trigger Workflow runs-on: ubuntu-latest - if: ${{ github.event.commits[0].author.username == 'dependabot[bot]' && github.repository_owner == 'spring-projects' }} + if: ${{ github.event.commits[0].author.username == 'dependabot[bot]' && github.repository == 'spring-projects/spring-security' && startsWith(github.ref, 'refs/heads/') }} steps: - name: Checkout id: checkout