Skip to content

Commit 147c256

Browse files
crusherdcrusherd
authored
Merge branch 'main' into patch/rest-client-doc-java-compile-error
2 parents e45b405 + e670c6b commit 147c256

File tree

2,018 files changed

+75040
-16526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,018 files changed

+75040
-16526
lines changed

‎.github/actions/create-github-release/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ inputs:
77
token:
88
description: 'Token to use for authentication with GitHub'
99
required: true
10+
pre-release:
11+
description: 'Whether the release is a pre-release (a milestone or release candidate)'
12+
required: false
13+
default: 'false'
1014
runs:
1115
using: composite
1216
steps:
@@ -20,4 +24,4 @@ runs:
2024
env:
2125
GITHUB_TOKEN: ${{ inputs.token }}
2226
shell: bash
23-
run: gh release create ${{ format('v{0}', inputs.milestone) }} --notes-file changelog.md
27+
run: gh release create ${{ format('v{0}', inputs.milestone) }} --notes-file changelog.md ${{ inputs.pre-release == 'true' && '--prerelease' || '' }}

‎.github/actions/prepare-gradle-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ runs:
2727
${{ inputs.java-version }}
2828
${{ inputs.java-toolchain == 'true' && '17' || '' }}
2929
- name: Set Up Gradle
30-
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
30+
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
3131
with:
3232
cache-read-only: false
3333
develocity-access-key: ${{ inputs.develocity-access-key }}

‎.github/actions/print-jvm-thread-dumps/action.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Print JVM thread dumps
2+
description: Prints a thread dump for all running JVMs
3+
runs:
4+
using: composite
5+
steps:
6+
- if: ${{ runner.os == 'Linux' }}
7+
shell: bash
8+
run: |
9+
for jvm_pid in $(jps -q -J-XX:+PerfDisableSharedMem); do
10+
jcmd $jvm_pid Thread.print
11+
done
12+
- if: ${{ runner.os == 'Windows' }}
13+
shell: powershell
14+
run: |
15+
foreach ($jvm_pid in $(jps -q -J-XX:+PerfDisableSharedMem)) {
16+
jcmd $jvm_pid Thread.print
17+
}

‎.github/actions/sync-to-maven-central/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
using: composite
2121
steps:
2222
- name: Set Up JFrog CLI
23-
uses: jfrog/setup-jfrog-cli@7c95feb32008765e1b4e626b078dfd897c4340ad # v4.1.2
23+
uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3
2424
env:
2525
JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
2626
- name: Download Release Artifacts

‎.github/workflows/build-and-deploy-snapshot.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ name: Build and Deploy Snapshot
22
on:
33
push:
44
branches:
5-
- 6.1.x
6-
permissions:
7-
actions: write
5+
- main
86
concurrency:
97
group: ${{ github.workflow }}-${{ github.ref }}
108
jobs:
119
build-and-deploy-snapshot:
1210
name: Build and Deploy Snapshot
1311
runs-on: ubuntu-latest
12+
timeout-minutes: 60
1413
if: ${{ github.repository == 'spring-projects/spring-framework' }}
1514
steps:
1615
- name: Check Out Code
@@ -27,7 +26,7 @@ jobs:
2726
uri: 'https://repo.spring.io'
2827
username: ${{ secrets.ARTIFACTORY_USERNAME }}
2928
password: ${{ secrets.ARTIFACTORY_PASSWORD }}
30-
build-name: 'spring-framework-6.1.x'
29+
build-name: 'spring-framework-6.2.x'
3130
repository: 'libs-snapshot-local'
3231
folder: 'deployment-repository'
3332
signing-key: ${{ secrets.GPG_PRIVATE_KEY }}

‎.github/workflows/build-pull-request.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Build Pull Request
2+
on: pull_request
3+
4+
permissions:
5+
contents: read
6+
7+
jobs:
8+
build:
9+
name: Build Pull Request
10+
runs-on: ubuntu-latest
11+
timeout-minutes: 60
12+
if: ${{ github.repository == 'spring-projects/spring-framework' }}
13+
steps:
14+
- name: Set up JDK 17
15+
uses: actions/setup-java@v4
16+
with:
17+
java-version: '17'
18+
distribution: 'liberica'
19+
- name: Check Out
20+
uses: actions/checkout@v4
21+
- name: Validate Gradle Wrapper
22+
uses: gradle/actions/wrapper-validation@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
23+
- name: Set Up Gradle
24+
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
25+
- name: Build
26+
env:
27+
CI: 'true'
28+
GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
29+
run: ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --no-parallel --continue build
30+
- name: Print JVM Thread Dumps When Cancelled
31+
uses: ./.github/actions/print-jvm-thread-dumps
32+
if: cancelled()
33+
- name: Upload Build Reports
34+
uses: actions/upload-artifact@v4
35+
if: failure()
36+
with:
37+
name: build-reports
38+
path: '**/build/reports/'

‎.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: CI
22
on:
3-
push:
4-
branches:
5-
- 6.1.x
3+
schedule:
4+
- cron: '30 9 * * *'
65
concurrency:
76
group: ${{ github.workflow }}-${{ github.ref }}
87
jobs:
98
ci:
109
name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'
1110
runs-on: ${{ matrix.os.id }}
11+
timeout-minutes: 60
1212
if: ${{ github.repository == 'spring-projects/spring-framework' }}
1313
strategy:
1414
matrix:

‎.github/workflows/release-milestone.yml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Release Milestone
2+
on:
3+
push:
4+
tags:
5+
- v6.2.0-M[1-9]
6+
- v6.2.0-RC[1-9]
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
jobs:
10+
build-and-stage-release:
11+
if: ${{ github.repository == 'spring-projects/spring-framework' }}
12+
name: Build and Stage Release
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Check Out Code
16+
uses: actions/checkout@v4
17+
- name: Build and Publish
18+
id: build-and-publish
19+
uses: ./.github/actions/build
20+
with:
21+
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
22+
publish: true
23+
- name: Stage Release
24+
uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
25+
with:
26+
uri: 'https://repo.spring.io'
27+
username: ${{ secrets.ARTIFACTORY_USERNAME }}
28+
password: ${{ secrets.ARTIFACTORY_PASSWORD }}
29+
build-name: ${{ format('spring-framework-{0}', steps.build-and-publish.outputs.version)}}
30+
repository: 'libs-staging-local'
31+
folder: 'deployment-repository'
32+
signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
33+
signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
34+
artifact-properties: |
35+
/**/framework-api-*.zip::zip.name=spring-framework,zip.deployed=false
36+
/**/framework-api-*-docs.zip::zip.type=docs
37+
/**/framework-api-*-schema.zip::zip.type=schema
38+
outputs:
39+
version: ${{ steps.build-and-publish.outputs.version }}
40+
verify:
41+
name: Verify
42+
needs: build-and-stage-release
43+
uses: ./.github/workflows/verify.yml
44+
with:
45+
staging: true
46+
version: ${{ needs.build-and-stage-release.outputs.version }}
47+
secrets:
48+
google-chat-webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
49+
repository-password: ${{ secrets.ARTIFACTORY_PASSWORD }}
50+
repository-username: ${{ secrets.ARTIFACTORY_USERNAME }}
51+
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
52+
promote-release:
53+
name: Promote Release
54+
needs:
55+
- build-and-stage-release
56+
- verify
57+
runs-on: ubuntu-latest
58+
steps:
59+
- name: Set up JFrog CLI
60+
uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3
61+
env:
62+
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
63+
- name: Promote build
64+
run: jfrog rt build-promote ${{ format('spring-framework-{0}', needs.build-and-stage-release.outputs.version)}} ${{ github.run_number }} libs-milestone-local
65+
create-github-release:
66+
name: Create GitHub Release
67+
needs:
68+
- build-and-stage-release
69+
- promote-release
70+
runs-on: ubuntu-latest
71+
steps:
72+
- name: Check Out Code
73+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
74+
- name: Create GitHub Release
75+
uses: ./.github/actions/create-github-release
76+
with:
77+
milestone: ${{ needs.build-and-stage-release.outputs.version }}
78+
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
79+
pre-release: true

‎.github/workflows/release.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Release
22
on:
33
push:
44
tags:
5-
- v6.1.[0-9]+
5+
- v6.2.[0-9]+
66
concurrency:
77
group: ${{ github.workflow }}-${{ github.ref }}
88
jobs:
@@ -22,14 +22,18 @@ jobs:
2222
- name: Stage Release
2323
uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
2424
with:
25-
build-name: ${{ format('spring-framework-{0}', steps.build-and-publish.outputs.version)}}
26-
folder: 'deployment-repository'
25+
uri: 'https://repo.spring.io'
26+
username: ${{ secrets.ARTIFACTORY_USERNAME }}
2727
password: ${{ secrets.ARTIFACTORY_PASSWORD }}
28+
build-name: ${{ format('spring-framework-{0}', steps.build-and-publish.outputs.version)}}
2829
repository: 'libs-staging-local'
30+
folder: 'deployment-repository'
2931
signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
3032
signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
31-
uri: 'https://repo.spring.io'
32-
username: ${{ secrets.ARTIFACTORY_USERNAME }}
33+
artifact-properties: |
34+
/**/framework-api-*.zip::zip.name=spring-framework,zip.deployed=false
35+
/**/framework-api-*-docs.zip::zip.type=docs
36+
/**/framework-api-*-schema.zip::zip.type=schema
3337
outputs:
3438
version: ${{ steps.build-and-publish.outputs.version }}
3539
verify:
@@ -69,7 +73,7 @@ jobs:
6973
runs-on: ubuntu-latest
7074
steps:
7175
- name: Set up JFrog CLI
72-
uses: jfrog/setup-jfrog-cli@7c95feb32008765e1b4e626b078dfd897c4340ad # v4.1.2
76+
uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3
7377
env:
7478
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
7579
- name: Promote build

‎.github/workflows/update-antora-ui-spring.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Update Antora UI Spring
2+
3+
on:
4+
schedule:
5+
- cron: '0 10 * * *' # Once per day at 10am UTC
6+
workflow_dispatch:
7+
8+
permissions:
9+
pull-requests: write
10+
issues: write
11+
contents: write
12+
13+
jobs:
14+
update-antora-ui-spring:
15+
runs-on: ubuntu-latest
16+
name: Update on Supported Branches
17+
strategy:
18+
matrix:
19+
branch: [ '6.0.x', '6.1.x', 'main' ]
20+
steps:
21+
- uses: spring-io/spring-doc-actions/update-antora-spring-ui@5a57bcc6a0da2a1474136cf29571b277850432bc
22+
name: Update
23+
with:
24+
docs-branch: ${{ matrix.branch }}
25+
token: ${{ secrets.GITHUB_TOKEN }}
26+
antora-file-path: 'framework-docs/antora-playbook.yml'
27+
update-antora-ui-spring-docs-build:
28+
runs-on: ubuntu-latest
29+
name: Update on docs-build
30+
steps:
31+
- uses: spring-io/spring-doc-actions/update-antora-spring-ui@5a57bcc6a0da2a1474136cf29571b277850432bc
32+
name: Update
33+
with:
34+
docs-branch: 'docs-build'
35+
token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)