From 93f646496d916a4d6f64badcbb1ea27781e8265f Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Tue, 28 Jan 2025 15:35:02 +0000
Subject: [PATCH] Prepare branch for early restructure work on 4.0

---
 .../workflows/build-and-deploy-snapshot.yml   | 15 ++--------
 .github/workflows/ci.yml                      |  2 +-
 .github/workflows/run-system-tests.yml        |  2 +-
 .github/workflows/trigger-docs-build.yml      | 29 -------------------
 gradle.properties                             |  2 +-
 5 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 .github/workflows/trigger-docs-build.yml

diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml
index b7e70af19f..e94a87c025 100644
--- a/.github/workflows/build-and-deploy-snapshot.yml
+++ b/.github/workflows/build-and-deploy-snapshot.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - 4.0.x
+      - 4.0.x-restructure
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
@@ -28,7 +28,7 @@ jobs:
       - name: Deploy
         uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
         with:
-          build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.0.x') || format('spring-boot-{0}', '4.0.x') }}
+          build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.0.x-restructure') || format('spring-boot-{0}', '4.0.x-restructure') }}
           folder: 'deployment-repository'
           password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }}
           project: ${{ vars.COMMERCIAL && 'spring' }}
@@ -47,17 +47,6 @@ jobs:
           webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
     outputs:
       version: ${{ steps.build-and-publish.outputs.version }}
-  trigger-docs-build:
-    name: Trigger Docs Build
-    needs: build-and-deploy-snapshot
-    permissions:
-      actions: write
-    runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
-    steps:
-      - name: Run Deploy Docs Workflow
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh workflow run deploy-docs.yml --repo spring-projects/spring-boot -r docs-build -f build-refname=${{ github.ref_name }} -f build-version=${{ needs.build-and-deploy-snapshot.outputs.version }}
   verify:
     name: Verify
     needs: build-and-deploy-snapshot
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f437451ac..ec85080963 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 on:
   push:
     branches:
-      - 4.0.x
+      - 4.0.x-restructure
 jobs:
   ci:
     name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'
diff --git a/.github/workflows/run-system-tests.yml b/.github/workflows/run-system-tests.yml
index 77db6ed25d..7983d16437 100644
--- a/.github/workflows/run-system-tests.yml
+++ b/.github/workflows/run-system-tests.yml
@@ -2,7 +2,7 @@ name: Run System Tests
 on:
   push:
     branches:
-      - 4.0.x
+      - 4.0.x-restructure
 jobs:
   run-system-tests:
     name: 'Java ${{ matrix.java.version}}'
diff --git a/.github/workflows/trigger-docs-build.yml b/.github/workflows/trigger-docs-build.yml
deleted file mode 100644
index e583dd8858..0000000000
--- a/.github/workflows/trigger-docs-build.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Trigger Docs Build
-on:
-  push:
-    branches: main
-    paths: [ 'antora/*' ]
-  workflow_dispatch:
-    inputs:
-      build-refname:
-        description: 'Git refname to build (e.g., 1.0.x)'
-        required: false
-      build-version:
-        description: 'Version being build (e.g. 1.0.3-SNAPSHOT)'
-        required: false  
-permissions:
-  actions: write
-jobs:
-  trigger-docs-build:
-    name: Trigger Docs Build
-    if: github.repository_owner == 'spring-projects'
-    runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
-    steps:
-    - name: Check Out
-      uses: actions/checkout@v4
-      with:
-        ref: docs-build
-    - name: Trigger Workflow
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: gh workflow run deploy-docs.yml -r docs-build -f build-refname=${{ github.event.inputs.build-refname }} -f build-version=${{ github.event.inputs.build-version }}
diff --git a/gradle.properties b/gradle.properties
index acd755fd75..06496dec89 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=4.0.0-SNAPSHOT
+version=4.0.0-restructure-SNAPSHOT
 latestVersion=true
 spring.build-type=oss