Skip to content

Commit 685877e

Browse files
authored
Merge branch 'main' into support_crac_on_powertools_metrics
2 parents 27dad71 + c08e1ef commit 685877e

File tree

149 files changed

+2546
-495
lines changed

Some content is hidden

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

149 files changed

+2546
-495
lines changed

.github/dependabot.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "maven"
3+
- package-ecosystem: "github-actions"
44
directory: "/"
55
schedule:
6-
interval: "weekly"
7-
labels:
8-
- "maven"
9-
- "dependencies"
10-
ignore:
11-
# Ignore Mockito 5.X.X as it does not support Java 8
12-
- dependency-name: "org.mockito:mockito-*"
13-
update-types: ["version-update:semver-major"]
6+
interval: "daily"
7+
commit-message:
8+
prefix: chore
9+
10+
- package-ecosystem: docker
11+
directories:
12+
- "/powertools-e2e-tests/src/test/resources/docker"
13+
- "/docs"
14+
- "/examples/**"
15+
schedule:
16+
interval: daily
17+
commit-message:
18+
prefix: chore
1419

1520
- package-ecosystem: "maven"
1621
directory: "/"
17-
target-branch: "v2"
1822
schedule:
19-
interval: "weekly"
23+
interval: "daily"
2024
labels:
2125
- "maven"
2226
- "dependencies"

.github/workflows/build-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
docker build -t squidfunk/mkdocs-material ./docs/
4242
docker run --rm -t -v ${PWD}:/docs squidfunk/mkdocs-material build
4343
- name: Configure AWS credentials
44-
uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722
44+
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df
4545
with:
4646
aws-region: us-east-1
4747
role-to-assume: ${{ secrets.AWS_DOCS_ROLE_ARN }}

.github/workflows/check-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
name: Checkout repository
9797
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9898
- name: Setup Java
99-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
99+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
100100
with:
101101
distribution: corretto
102102
java-version: ${{ matrix.java }}

.github/workflows/check-e2e.yml

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
id-token: write
4848
environment: E2E
4949
strategy:
50+
fail-fast: false
5051
max-parallel: 3
5152
matrix:
5253
java:
@@ -55,19 +56,52 @@ jobs:
5556
- 21
5657

5758
steps:
58-
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
59+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5960
- name: Setup java
60-
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
61+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
6162
with:
6263
distribution: 'corretto'
6364
java-version: ${{ matrix.java }}
6465
cache: maven
6566
- name: Setup AWS credentials
66-
uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 # v2.2.0
67+
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
6768
with:
6869
role-to-assume: ${{ secrets.AWS_IAM_ROLE }}
6970
aws-region: us-east-1
7071
- name: Run e2e test with Maven
7172
env:
7273
JAVA_VERSION: ${{ matrix.java }}
73-
run: mvn -DskipTests install --file pom.xml && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml
74+
run: mvn -DskipTests -ntp install --file pom.xml && mvn -Pe2e -B -ntp verify --file powertools-e2e-tests/pom.xml
75+
76+
e2e-graal:
77+
name: End-to-end GraalVM Tests (Java ${{ matrix.java }})
78+
runs-on: ubuntu-latest
79+
permissions:
80+
id-token: write
81+
environment: E2E
82+
strategy:
83+
fail-fast: false
84+
max-parallel: 3
85+
matrix:
86+
java:
87+
- 11
88+
- 17
89+
- 21
90+
91+
steps:
92+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
93+
- name: Setup java
94+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
95+
with:
96+
distribution: 'corretto'
97+
java-version: ${{ matrix.java }}
98+
cache: maven
99+
- name: Setup AWS credentials
100+
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
101+
with:
102+
role-to-assume: ${{ secrets.AWS_IAM_ROLE }}
103+
aws-region: us-east-1
104+
- name: Run e2e-graal test with Maven
105+
env:
106+
JAVA_VERSION: ${{ matrix.java }}
107+
run: mvn -DskipTests -ntp install --file pom.xml && mvn -Pe2e-graal -B -ntp verify --file powertools-e2e-tests/pom.xml

.github/workflows/check-pmd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Checkout Repository
3232
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3333
- name: Setup Java
34-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
34+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
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@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
43+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4444
- name: Setup Java
45-
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
45+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
4646
with:
4747
distribution: 'corretto'
4848
java-version: 21

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
snapshot: ${{ inputs.snapshot}}
113113
- id: upload_source
114114
name: Upload artifacts
115-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
115+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
116116
with:
117117
if-no-files-found: error
118118
name: source
@@ -133,11 +133,11 @@ jobs:
133133
steps:
134134
- id: download_source
135135
name: Download artifacts
136-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.6.1
136+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.6.1
137137
with:
138138
name: source
139139
- name: Setup Java
140-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
140+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
141141
with:
142142
distribution: corretto
143143
java-version: 21
@@ -168,11 +168,11 @@ jobs:
168168
steps:
169169
- id: download_source
170170
name: Download artifacts
171-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.6.1
171+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.6.1
172172
with:
173173
name: source
174174
- name: Setup Java
175-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
175+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
176176
with:
177177
distribution: corretto
178178
java-version: ${{ matrix.java }}
@@ -191,11 +191,11 @@ jobs:
191191
steps:
192192
- id: download_source
193193
name: Download artifacts
194-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.6.1
194+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.6.1
195195
with:
196196
name: source
197197
- name: Setup Java
198-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
198+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
199199
with:
200200
distribution: corretto
201201
java-version: 21
@@ -229,7 +229,7 @@ jobs:
229229
ref: ${{ env.RELEASE_COMMIT }}
230230
- id: download_source
231231
name: Download artifacts
232-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.6.1
232+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.6.1
233233
with:
234234
name: source
235235
- id: setup-git
@@ -278,7 +278,7 @@ jobs:
278278
docker build -t squidfunk/mkdocs-material ./docs/
279279
docker run --rm -t -v ${PWD}:/docs squidfunk/mkdocs-material build
280280
- name: Configure AWS credentials
281-
uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722
281+
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df
282282
with:
283283
aws-region: us-east-1
284284
role-to-assume: ${{ secrets.AWS_DOCS_ROLE_ARN }}

.github/workflows/security-dependabot.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ jobs:
3434
- name: Checkout Repository
3535
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3636
- name: Verify Contents
37-
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
37+
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
3838
with:
3939
config-file: './.github/dependency-review-config.yml'

.github/workflows/security-osv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ jobs:
3232
actions: read
3333
contents: read
3434
security-events: write
35-
uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@764c91816374ff2d8fc2095dab36eecd42d61638 # v1.9.2
35+
uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@b00f71e051ddddc6e46a193c31c8c0bf283bf9e6 # v2.1.0

0 commit comments

Comments
 (0)