From bdfae84147a5954153ad437861776dd3f8017c24 Mon Sep 17 00:00:00 2001 From: Spring Builds Date: Mon, 31 Aug 2026 14:39:39 +0000 Subject: [PATCH 1/5] Retarget workflow triggers to 5.0.x [skip actions] --- .github/workflows/ci.yaml | 8 ++------ .github/workflows/deploy-docs.yml | 11 +++-------- .github/workflows/pr.yml | 4 +--- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3371c65d..9b614abc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,25 +1,21 @@ name: Spring Cloud Build CI Job - on: workflow_call: push: branches: - - main + - 5.0.x - 4.3.x - # Scheduled builds run daily at midnight UTC schedule: - cron: '0 0 * * *' - # Manual trigger with optional branch override workflow_dispatch: inputs: branches: description: "Which branch should be built (can be a comma-separated list of branches)" required: true - default: 'main' + default: '5.0.x' type: string - jobs: deploy: uses: spring-cloud/spring-cloud-github-actions/.github/workflows/deploy.yml@b6a6b1963b8762420526591c3d363bd7d09e7d4b # v1.1.1 diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index bab58641..336cef42 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -5,7 +5,6 @@ # there and re-run the rollout, otherwise your change will be overwritten. name: Deploy Docs - on: push: # Allow-list of exactly this branch. A topic or Dependabot branch cut from @@ -13,16 +12,14 @@ on: # those would dispatch a full docs build for a ref that is not in the # Antora playbook. branches: - - main + - 5.0.x tags: '**' repository_dispatch: types: request-build-reference # legacy workflow_dispatch: - permissions: - contents: read # required to check out private commercial repositories - actions: write # required to dispatch the docs build - + contents: read # required to check out private commercial repositories + actions: write # required to dispatch the docs build jobs: build: runs-on: ubuntu-latest @@ -32,7 +29,6 @@ jobs: with: ref: docs-build fetch-depth: 1 - # A branch push rebuilds just that branch's docs; a tag push rebuilds # everything so the new version appears in the version dropdown. - name: Dispatch (partial build) @@ -40,7 +36,6 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }} - - name: Dispatch (full build) if: github.ref_type == 'tag' env: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 71f11885..469da98b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,9 +1,7 @@ name: PR - on: pull_request: - branches: [ main, 4.3.x ] - + branches: [5.0.x, 4.3.x] jobs: build: uses: spring-cloud/spring-cloud-github-actions/.github/workflows/pr.yml@b6a6b1963b8762420526591c3d363bd7d09e7d4b # v1.1.1 From d2861c87c8c48026c77bce8c166e478b798e7e52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2026 14:40:31 +0000 Subject: [PATCH 2/5] Bump io.spring.javaformat:spring-javaformat-maven-plugin Bumps [io.spring.javaformat:spring-javaformat-maven-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.47 to 0.0.48. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.47...v0.0.48) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-maven-plugin dependency-version: 0.0.48 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b9acd09..c325814b 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ ${maven-checkstyle-plugin.version} 12.1.2 - 0.0.47 + 0.0.48 3.5.6 3.12.0 3.3.1 From 81292d8649256b47be600499b8ec7dcacc8f10b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2026 14:40:38 +0000 Subject: [PATCH 3/5] Bump org.codehaus.mojo:flatten-maven-plugin from 1.7.2 to 1.7.3 Bumps [org.codehaus.mojo:flatten-maven-plugin](https://github.com/mojohaus/flatten-maven-plugin) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/mojohaus/flatten-maven-plugin/releases) - [Commits](https://github.com/mojohaus/flatten-maven-plugin/compare/1.7.2...1.7.3) --- updated-dependencies: - dependency-name: org.codehaus.mojo:flatten-maven-plugin dependency-version: 1.7.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b9acd09..79a3c861 100644 --- a/pom.xml +++ b/pom.xml @@ -349,7 +349,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.7.2 + 1.7.3 true From c5e3991bf104194209411a997d7e2778bc3031e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2026 14:40:44 +0000 Subject: [PATCH 4/5] Bump io.spring.javaformat:spring-javaformat-checkstyle Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.47 to 0.0.48. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.47...v0.0.48) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-version: 0.0.48 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b9acd09..2c967fcb 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 3.2.0 3.2.3 2.7.1 - 0.0.47 + 0.0.48 3.6.0 0.16 false From 7cc7ddb72e95af6c0702778c1fe18edfe6bb43f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2026 21:16:53 +0100 Subject: [PATCH 5/5] Bump antora from 3.2.0-rc.2 to 3.2.0-rc.3 in /docs (#676) Bumps [antora](https://gitlab.com/antora/antora/tree/HEAD/packages/antora) from 3.2.0-rc.2 to 3.2.0-rc.3. - [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc) - [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-rc.2...v3.2.0-rc.3) --- updated-dependencies: - dependency-name: antora dependency-version: 3.2.0-rc.3 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> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index cea078da..253ac524 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "antora": "3.2.0-rc.2", + "antora": "3.2.0-rc.3", "@antora/atlas-extension": "1.0.0-alpha.5", "@antora/collector-extension": "1.0.3", "@asciidoctor/tabs": "1.0.0-beta.6",