Skip to content

Commit 1db4230

Browse files
committed
Merge branch 'main' into phipag/issue1803
2 parents ede1593 + cbdf81f commit 1db4230

File tree

36 files changed

+100
-110
lines changed

36 files changed

+100
-110
lines changed

.github/branch_protection_settings/main.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"required_pull_request_reviews": {
2020
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/required_pull_request_reviews",
2121
"dismiss_stale_reviews": true,
22-
"require_code_owner_reviews": false,
22+
"require_code_owner_reviews": true,
2323
"require_last_push_approval": true,
2424
"required_approving_review_count": 1,
2525
"dismissal_restrictions": {
@@ -37,7 +37,7 @@
3737
},
3838
"enforce_admins": {
3939
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/enforce_admins",
40-
"enabled": false
40+
"enabled": true
4141
},
4242
"required_linear_history": {
4343
"enabled": true

.github/workflows/build-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
environment: Docs
3333
steps:
3434
- name: Checkout Repository
35-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
35+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
3636
with:
3737
fetch-depth: 0
3838
- name: Build

.github/workflows/check-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ jobs:
7474
steps:
7575
- id: checkout
7676
name: Checkout repository
77-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
77+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7878
- name: Setup Java
79-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
79+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
8080
with:
8181
distribution: corretto
8282
java-version: ${{ matrix.java }}

.github/workflows/check-e2e.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ jobs:
5656
- 21
5757

5858
steps:
59-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
59+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6060
- name: Setup java
61-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
61+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
6262
with:
6363
distribution: 'corretto'
6464
java-version: ${{ matrix.java }}
@@ -89,9 +89,9 @@ jobs:
8989
- 21
9090

9191
steps:
92-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
92+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9393
- name: Setup java
94-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
94+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
9595
with:
9696
distribution: 'corretto'
9797
java-version: ${{ matrix.java }}

.github/workflows/check-pmd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
id-token: write
3030
steps:
3131
- name: Checkout Repository
32-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
32+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3333
- name: Setup Java
34-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
34+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3535
with:
3636
java-version: 21
3737
distribution: corretto

.github/workflows/check-spotbugs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
codecheck:
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
43+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4444
- name: Setup Java
45-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
45+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
4646
with:
4747
distribution: 'corretto'
4848
java-version: 21

.github/workflows/release.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
steps:
104104
- id: checkout
105105
name: Checkout repository
106-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
106+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
107107
- id: version
108108
name: version
109109
uses: ./.github/actions/version
@@ -137,7 +137,7 @@ jobs:
137137
with:
138138
name: source
139139
- name: Setup Java
140-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
140+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
141141
with:
142142
distribution: corretto
143143
java-version: 21
@@ -172,7 +172,7 @@ jobs:
172172
with:
173173
name: source
174174
- name: Setup Java
175-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
175+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
176176
with:
177177
distribution: corretto
178178
java-version: ${{ matrix.java }}
@@ -195,7 +195,7 @@ jobs:
195195
with:
196196
name: source
197197
- name: Setup Java
198-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
198+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
199199
with:
200200
distribution: corretto
201201
java-version: 21
@@ -224,7 +224,7 @@ jobs:
224224
steps:
225225
- id: checkout
226226
name: Checkout repository
227-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
227+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
228228
with:
229229
ref: ${{ env.RELEASE_COMMIT }}
230230
- id: download_source
@@ -271,7 +271,10 @@ jobs:
271271
steps:
272272
- id: checkout
273273
name: Checkout repository
274-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
274+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
275+
with:
276+
# Checkout PR branch to make sure we build the version-bumped docs
277+
ref: ci-${{ github.run_id }}
275278
- name: Build
276279
run: |
277280
mkdir -p dist

.github/workflows/security-branch-protections.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- v1
4747
steps:
4848
- name: Checkout repository
49-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
49+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5050
- name: Fetch branch protections
5151
id: fetch
5252
env:

.github/workflows/security-dependencies-check.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,12 @@
66
#
77
# Triggers:
88
# - pull_request
9-
# - push
10-
# - workflow_dispatch
11-
# - cron: daily at 12:00PM
129

1310
on:
14-
pull_request:
15-
workflow_dispatch:
16-
push:
17-
branches: [ main ]
18-
schedule:
19-
- cron: '0 12 * * *' # Run daily at 12:00 UTC
11+
pull_request:
2012

2113
name: Verify Dependencies
22-
run-name: Verify Dependencies – ${{ github.event_name }}
14+
run-name: Verify Dependencies – ${{ github.event_name }}
2315

2416
permissions:
2517
contents: read
@@ -32,8 +24,8 @@ jobs:
3224
pull-requests: write
3325
steps:
3426
- name: Checkout Repository
35-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
27+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3628
- name: Verify Contents
37-
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
29+
uses: actions/dependency-review-action@bc41886e18ea39df68b1b1245f4184881938e050 # v4.7.2
3830
with:
39-
config-file: './.github/dependency-review-config.yml'
31+
config-file: './.github/dependency-review-config.yml'

.github/workflows/security-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
id-token: write
3636
steps:
3737
- name: Checkout Repository
38-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
38+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3939
with:
4040
persist-credentials: false
4141
- name: Run Analysis
@@ -52,6 +52,6 @@ jobs:
5252
path: results.sarif
5353
retention-days: 5
5454
- name: Upload to Code-Scanning
55-
uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.5
55+
uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
5656
with:
5757
sarif_file: results.sarif

0 commit comments

Comments
 (0)