Skip to content

Commit c2e86ad

Browse files
Merge branch '5.6.x' into 5.7.x
Closes gh-12297
2 parents 9b3f834 + 9c6d904 commit c2e86ad

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

.github/workflows/continuous-integration-workflow.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131
runjobs: ${{ steps.continue.outputs.runjobs }}
3232
project_version: ${{ steps.continue.outputs.project_version }}
3333
steps:
34-
- uses: actions/checkout@v2
34+
- uses: actions/checkout@v3
3535
- id: continue
3636
name: Determine if should continue
3737
run: |
3838
# Run jobs if in upstream repository
39-
echo "::set-output name=runjobs::true"
39+
echo "runjobs=true" >>$GITHUB_OUTPUT
4040
# Extract version from gradle.properties
4141
version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}')
42-
echo "::set-output name=project_version::$version"
42+
echo "project_version=$version" >>$GITHUB_OUTPUT
4343
build_jdk_11:
4444
name: Build JDK 11
4545
needs: [prerequisites]
@@ -49,9 +49,9 @@ jobs:
4949
runs-on: ${{ matrix.os }}
5050
if: needs.prerequisites.outputs.runjobs
5151
steps:
52-
- uses: actions/checkout@v2
52+
- uses: actions/checkout@v3
5353
- name: Set up JDK 11
54-
uses: actions/setup-java@v2
54+
uses: actions/setup-java@v3
5555
with:
5656
java-version: '11'
5757
distribution: 'adopt'
@@ -71,7 +71,7 @@ jobs:
7171
runs-on: ubuntu-latest
7272
if: needs.prerequisites.outputs.runjobs
7373
steps:
74-
- uses: actions/checkout@v2
74+
- uses: actions/checkout@v3
7575
- name: Set up gradle
7676
uses: spring-io/spring-gradle-build-action@v1
7777
with:
@@ -89,7 +89,7 @@ jobs:
8989
runs-on: ubuntu-latest
9090
if: needs.prerequisites.outputs.runjobs
9191
steps:
92-
- uses: actions/checkout@v2
92+
- uses: actions/checkout@v3
9393
- name: Set up gradle
9494
uses: spring-io/spring-gradle-build-action@v1
9595
with:
@@ -113,7 +113,7 @@ jobs:
113113
runs-on: ubuntu-latest
114114
if: needs.prerequisites.outputs.runjobs
115115
steps:
116-
- uses: actions/checkout@v2
116+
- uses: actions/checkout@v3
117117
- name: Set up gradle
118118
uses: spring-io/spring-gradle-build-action@v1
119119
with:
@@ -130,7 +130,7 @@ jobs:
130130
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
131131
runs-on: ubuntu-latest
132132
steps:
133-
- uses: actions/checkout@v2
133+
- uses: actions/checkout@v3
134134
- name: Set up gradle
135135
uses: spring-io/spring-gradle-build-action@v1
136136
with:
@@ -154,7 +154,7 @@ jobs:
154154
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
155155
runs-on: ubuntu-latest
156156
steps:
157-
- uses: actions/checkout@v2
157+
- uses: actions/checkout@v3
158158
- name: Set up gradle
159159
uses: spring-io/spring-gradle-build-action@v1
160160
with:
@@ -175,7 +175,7 @@ jobs:
175175
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
176176
runs-on: ubuntu-latest
177177
steps:
178-
- uses: actions/checkout@v2
178+
- uses: actions/checkout@v3
179179
- name: Set up gradle
180180
uses: spring-io/spring-gradle-build-action@v1
181181
with:
@@ -205,7 +205,7 @@ jobs:
205205
TOKEN: ${{ github.token }}
206206
VERSION: ${{ needs.prerequisites.outputs.project_version }}
207207
steps:
208-
- uses: actions/checkout@v2
208+
- uses: actions/checkout@v3
209209
with:
210210
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
211211
- name: Set up gradle
@@ -286,7 +286,7 @@ jobs:
286286
TOKEN: ${{ github.token }}
287287
VERSION: ${{ needs.prerequisites.outputs.project_version }}
288288
steps:
289-
- uses: actions/checkout@v2
289+
- uses: actions/checkout@v3
290290
- name: Set up gradle
291291
uses: spring-io/spring-gradle-build-action@v1
292292
with:

.github/workflows/pr-build-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
if: ${{ github.repository == 'spring-projects/spring-security' }}
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515
- name: Set up gradle
1616
uses: spring-io/spring-gradle-build-action@v1
1717
with:

.github/workflows/update-scheduled-release-version.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- id: checkout-source
2525
name: Checkout Source Code
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2727
with:
2828
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
2929
- name: Set up gradle
@@ -38,7 +38,7 @@ jobs:
3838
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
3939
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
4040
./gradlew gitHubCheckNextVersionDueToday
41-
echo "::set-output name=is_due_today::$(cat build/github/milestones/is-due-today)"
41+
echo "is_due_today=$(cat build/github/milestones/is-due-today)" >>$GITHUB_OUTPUT
4242
- id: check-open-issues
4343
name: Check for open issues
4444
if: steps.check-release-due.outputs.is_due_today == 'true'
@@ -47,7 +47,7 @@ jobs:
4747
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
4848
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
4949
./gradlew gitHubCheckMilestoneHasNoOpenIssues
50-
echo "::set-output name=is_open_issues::$(cat build/github/milestones/is-open-issues)"
50+
echo "is_open_issues=$(cat build/github/milestones/is-open-issues)" >>$GITHUB_OUTPUT
5151
- id: validate-release-state
5252
name: Validate State of Release
5353
if: steps.check-release-due.outputs.is_due_today == 'true' && steps.check-open-issues.outputs.is_open_issues == 'true'

0 commit comments

Comments
 (0)