Skip to content

Commit 27eae8b

Browse files
authored
Merge branch 'main' into feature/support_crac_on_powertools_batch
2 parents 5008fcd + f15b9a6 commit 27eae8b

7 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/build-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
docker build -t squidfunk/mkdocs-material ./docs/
4444
docker run --rm -t -v ${PWD}:/docs squidfunk/mkdocs-material build
4545
- name: Configure AWS credentials
46-
uses: aws-actions/configure-aws-credentials@517a711dbcd0e402f90c77e7e2f81e849156e31d
46+
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c
4747
with:
4848
aws-region: us-east-1
4949
role-to-assume: ${{ secrets.AWS_DOCS_ROLE_ARN }}

.github/workflows/check-e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
- name: Build all modules
117117
run: mvn -B -DskipTests -ntp install --file pom.xml
118118
- name: Setup AWS credentials
119-
uses: aws-actions/configure-aws-credentials@517a711dbcd0e402f90c77e7e2f81e849156e31d # v6.2.2
119+
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c # v6.2.3
120120
with:
121121
role-to-assume: ${{ secrets.AWS_IAM_ROLE }}
122122
aws-region: us-east-1
@@ -154,7 +154,7 @@ jobs:
154154
- name: Build all modules
155155
run: mvn -B -DskipTests -ntp install --file pom.xml
156156
- name: Setup AWS credentials
157-
uses: aws-actions/configure-aws-credentials@517a711dbcd0e402f90c77e7e2f81e849156e31d # v6.2.2
157+
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c # v6.2.3
158158
with:
159159
role-to-assume: ${{ secrets.AWS_IAM_ROLE }}
160160
aws-region: us-east-1

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ jobs:
286286
docker build -t squidfunk/mkdocs-material ./docs/
287287
docker run --rm -t -v ${PWD}:/docs squidfunk/mkdocs-material build
288288
- name: Configure AWS credentials
289-
uses: aws-actions/configure-aws-credentials@517a711dbcd0e402f90c77e7e2f81e849156e31d
289+
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c
290290
with:
291291
aws-region: us-east-1
292292
role-to-assume: ${{ secrets.AWS_DOCS_ROLE_ARN }}

.github/workflows/security-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
persist-credentials: false
4242
- name: Run Analysis
43-
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
43+
uses: ossf/scorecard-action@2d1146689b8cda280b9bc96326124645441f03bc # v2.4.4
4444
with:
4545
results_file: results.sarif
4646
results_format: sarif
@@ -53,6 +53,6 @@ jobs:
5353
path: results.sarif
5454
retention-days: 5
5555
- name: Upload to Code-Scanning
56-
uses: github/codeql-action/upload-sarif@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
56+
uses: github/codeql-action/upload-sarif@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
5757
with:
5858
sarif_file: results.sarif

examples/powertools-examples-cloudformation/infra/cdk/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<cdk.version>2.59.0</cdk.version>
12+
<cdk.version>2.253.0</cdk.version>
1313
<constructs.version>[10.0.0,11.0.0)</constructs.version>
1414
</properties>
1515

examples/powertools-examples-core-utilities/cdk/infra/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1010
<cdk.version>2.258.0</cdk.version>
1111
<constructs.version>[10.0.0,11.0.0)</constructs.version>
12-
<junit.version>5.14.3</junit.version>
12+
<junit.version>5.14.4</junit.version>
1313
</properties>
1414
<build>
1515
<plugins>

powertools-e2e-tests/src/test/resources/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use the official AWS SAM base image for Java 25
2-
FROM public.ecr.aws/sam/build-java25@sha256:41707b746816f8abfa0180625f9f974ddb471a62fc997ffc34ac72f6f52ced99
2+
FROM public.ecr.aws/sam/build-java25@sha256:3b4ae6fcb9f97d8da8efec23a3ceecabbbbab671b9bca2d50edc0ed8b1af8e12
33

44
# Install GraalVM dependencies
55
RUN curl -4 -L https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_linux-x64_bin.tar.gz | tar -xvz

0 commit comments

Comments
 (0)