Skip to content

Commit fbed55e

Browse files
authored
Merge branch 'spring-projects:main' into main
2 parents a773b28 + 21604d1 commit fbed55e

File tree

957 files changed

+12335
-13598
lines changed

Some content is hidden

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

957 files changed

+12335
-13598
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ runs:
3131
${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
3232
${{ inputs.java-toolchain == 'true' && '17' || '' }}
3333
- name: Set Up Gradle
34-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
34+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
3535
with:
3636
cache-read-only: false
3737
develocity-access-key: ${{ inputs.develocity-access-key }}
38+
develocity-token-expiry: 4
3839
- name: Configure Gradle Properties
3940
shell: bash
4041
run: |

.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@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
23+
uses: jfrog/setup-jfrog-cli@f748a0599171a192a2668afee8d0497f7c1069df # v4.5.6
2424
env:
2525
JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
2626
- name: Download Release Artifacts

.github/dco.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
require:
2+
members: false
3+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
2222
publish: true
2323
- name: Deploy
24-
uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
24+
uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
2525
with:
2626
artifact-properties: |
2727
/**/framework-api-*.zip::zip.name=spring-framework,zip.deployed=false

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

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,11 @@ jobs:
99
runs-on: ubuntu-latest
1010
timeout-minutes: 60
1111
steps:
12-
- name: Set Up JDK 17
13-
uses: actions/setup-java@v4
14-
with:
15-
distribution: 'liberica'
16-
java-version: '17'
17-
- name: Check Out
12+
- name: Check Out Code
1813
uses: actions/checkout@v4
19-
- name: Validate Gradle Wrapper
20-
uses: gradle/actions/wrapper-validation@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
21-
- name: Set Up Gradle
22-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
2314
- name: Build
24-
env:
25-
CI: 'true'
26-
GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
27-
run: ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --no-parallel --continue build
15+
id: build
16+
uses: ./.github/actions/build
2817
- name: Print JVM Thread Dumps When Cancelled
2918
if: cancelled()
3019
uses: ./.github/actions/print-jvm-thread-dumps

.github/workflows/release-milestone.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ concurrency:
88
group: ${{ github.workflow }}-${{ github.ref }}
99
jobs:
1010
build-and-stage-release:
11-
if: ${{ github.repository == 'spring-projects/spring-framework' }}
1211
name: Build and Stage Release
12+
if: ${{ github.repository == 'spring-projects/spring-framework' }}
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check Out Code
@@ -18,7 +18,7 @@ jobs:
1818
id: build-and-publish
1919
uses: ./.github/actions/build
2020
with:
21-
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
21+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
2222
publish: true
2323
- name: Stage Release
2424
uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
@@ -41,23 +41,40 @@ jobs:
4141
name: Verify
4242
needs: build-and-stage-release
4343
uses: ./.github/workflows/verify.yml
44-
with:
45-
staging: true
46-
version: ${{ needs.build-and-stage-release.outputs.version }}
4744
secrets:
4845
google-chat-webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
4946
repository-password: ${{ secrets.ARTIFACTORY_PASSWORD }}
5047
repository-username: ${{ secrets.ARTIFACTORY_USERNAME }}
5148
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
49+
with:
50+
staging: true
51+
version: ${{ needs.build-and-stage-release.outputs.version }}
52+
sync-to-maven-central:
53+
name: Sync to Maven Central
54+
needs:
55+
- build-and-stage-release
56+
- verify
57+
runs-on: ubuntu-latest
58+
steps:
59+
- name: Check Out Code
60+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
61+
- name: Sync to Maven Central
62+
uses: ./.github/actions/sync-to-maven-central
63+
with:
64+
jfrog-cli-config-token: ${{ secrets.JF_ARTIFACTORY_SPRING }}
65+
ossrh-s01-staging-profile: ${{ secrets.OSSRH_S01_STAGING_PROFILE }}
66+
ossrh-s01-token-password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
67+
ossrh-s01-token-username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
68+
spring-framework-version: ${{ needs.build-and-stage-release.outputs.version }}
5269
promote-release:
5370
name: Promote Release
5471
needs:
5572
- build-and-stage-release
56-
- verify
73+
- sync-to-maven-central
5774
runs-on: ubuntu-latest
5875
steps:
5976
- name: Set up JFrog CLI
60-
uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
77+
uses: jfrog/setup-jfrog-cli@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2
6178
env:
6279
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
6380
- name: Promote build

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
2121
publish: true
2222
- name: Stage Release
23-
uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
23+
uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
2424
with:
2525
artifact-properties: |
2626
/**/framework-api-*.zip::zip.name=spring-framework,zip.deployed=false
@@ -73,7 +73,7 @@ jobs:
7373
runs-on: ubuntu-latest
7474
steps:
7575
- name: Set up JFrog CLI
76-
uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
76+
uses: jfrog/setup-jfrog-cli@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2
7777
env:
7878
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
7979
- name: Promote build

.github/workflows/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
distribution: 'liberica'
4747
java-version: 17
4848
- name: Set Up Gradle
49-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
49+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
5050
with:
5151
cache-read-only: false
5252
- name: Configure Gradle Properties

.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Enable auto-env through the sdkman_auto_env config
22
# Add key=value pairs of SDKs to use below
3-
java=17.0.12-librca
3+
java=23.0.1-librca

CONTRIBUTING.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ First off, thank you for taking the time to contribute! :+1: :tada:
1616

1717
### Code of Conduct
1818

19-
This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc).
19+
This project is governed by the [Spring Code of Conduct](https://github.com/spring-projects/spring-framework#coc-ov-file).
2020
By participating you are expected to uphold this code.
2121
Please report unacceptable behavior to spring-code-of-conduct@spring.io.
2222

@@ -65,10 +65,6 @@ follow-up reports will need to be created as new issues with a fresh description
6565

6666
#### Submit a Pull Request
6767

68-
1. If you have not previously done so, please sign the
69-
[Contributor License Agreement](https://cla.spring.io/sign/spring). You will be reminded
70-
automatically when you submit the PR.
71-
7268
1. Should you create an issue first? No, just create the pull request and use the
7369
description to provide context and motivation, as you would for an issue. If you want
7470
to start a discussion first or have already created an issue, once a pull request is
@@ -85,6 +81,11 @@ multiple edits or corrections of the same logical change. See
8581
[Rewriting History section of Pro Git](https://git-scm.com/book/en/Git-Tools-Rewriting-History)
8682
for an overview of streamlining the commit history.
8783

84+
1. All commits must include a _Signed-off-by_ trailer at the end of each commit message
85+
to indicate that the contributor agrees to the Developer Certificate of Origin.
86+
For additional details, please refer to the blog post
87+
[Hello DCO, Goodbye CLA: Simplifying Contributions to Spring](https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring).
88+
8889
1. Format commit messages using 55 characters for the subject line, 72 characters per line
8990
for the description, followed by the issue fixed, for example, `Closes gh-22276`. See the
9091
[Commit Guidelines section of Pro Git](https://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines)

0 commit comments

Comments
 (0)