Skip to content

Commit 4c24808

Browse files
authored
Merge branch 'main' into feature/opentelemetry-tracing
2 parents adfff28 + b583e7f commit 4c24808

13 files changed

Lines changed: 20 additions & 20 deletions

File tree

.github/workflows/check-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
name: Checkout repository
8282
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
8383
- name: Setup Java
84-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961
84+
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c
8585
with:
8686
distribution: corretto
8787
java-version: ${{ matrix.java }}
@@ -107,7 +107,7 @@ jobs:
107107
powertools-*/**
108108
pom.xml
109109
- name: Setup GraalVM
110-
uses: graalvm/setup-graalvm@0def53c0fd8534bc13416c9469f5be45265824fd # v1.6.3
110+
uses: graalvm/setup-graalvm@5298d94fb55a4f185c602eeac5de1b553882abe2 # v1.6.4
111111
with:
112112
# Pinned to 21.0.8 due to unsafeAllocated enforcement in 21.0.10+. See #2416
113113
java-version: "21.0.8"

.github/workflows/check-e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
steps:
109109
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
110110
- name: Setup java
111-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
111+
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
112112
with:
113113
distribution: 'corretto'
114114
java-version: ${{ matrix.java }}
@@ -146,7 +146,7 @@ jobs:
146146
steps:
147147
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
148148
- name: Setup java
149-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
149+
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
150150
with:
151151
distribution: 'corretto'
152152
java-version: ${{ matrix.java }}

.github/workflows/check-pmd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Checkout Repository
3030
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3131
- name: Setup Java
32-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
32+
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
3333
with:
3434
java-version: 21
3535
distribution: corretto

.github/workflows/check-spotbugs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
steps:
4545
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4646
- name: Setup Java
47-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
47+
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
4848
with:
4949
distribution: 'corretto'
5050
java-version: 21

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
with:
138138
name: source
139139
- name: Setup Java
140-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961
140+
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c
141141
with:
142142
distribution: corretto
143143
java-version: 21
@@ -174,7 +174,7 @@ jobs:
174174
with:
175175
name: source
176176
- name: Setup Java
177-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961
177+
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c
178178
with:
179179
distribution: corretto
180180
java-version: ${{ matrix.java }}
@@ -199,7 +199,7 @@ jobs:
199199
with:
200200
name: source
201201
- name: Setup Java
202-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961
202+
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c
203203
with:
204204
distribution: corretto
205205
java-version: 21

.github/workflows/security-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
56+
uses: github/codeql-action/upload-sarif@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
5757
with:
5858
sarif_file: results.sarif

docs/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ gitdb==4.0.12 \
2222
--hash=sha256:5ef71f855d191a3326fcfbc0d5da835f26b13fbcba60c32c21091c349ffdb571 \
2323
--hash=sha256:67073e15955400952c6565cc3e707c554a4eea2e428946f7a4c162fab9bd9bcf
2424
# via gitpython
25-
gitpython==3.1.57 \
26-
--hash=sha256:4ccf7d73c10f5c9e76043fbb2675ac5a1b3ff5b41e648f56bcbed5f63792ecaf \
27-
--hash=sha256:c493ec57c0ef6b19743798b6a5af859c71814b524e7e6f97baa2f8e658961488
25+
gitpython==3.1.58 \
26+
--hash=sha256:621416df10ef3fd0e19fabf9172ddeed0fa704d353d04f194eec56a625a95b22 \
27+
--hash=sha256:d331e722577f0fd7fc1f857419b3ecc07af66282b933d2a4d95f84a042fdd50f
2828
# via mkdocs-git-revision-date-plugin
2929
hjson==3.1.0 \
3030
--hash=sha256:55af475a27cf83a7969c808399d7bccdec8fb836a07ddbd574587593b9cdcf75 \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<packaging>jar</packaging>
1212

1313
<properties>
14-
<log4j.version>2.26.0</log4j.version>
14+
<log4j.version>2.26.1</log4j.version>
1515
<maven.compiler.source>11</maven.compiler.source>
1616
<maven.compiler.target>11</maven.compiler.target>
1717
<aspectj.version>1.9.20.1</aspectj.version>

examples/powertools-examples-core-utilities/sam-graalvm/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<packaging>jar</packaging>
1010

1111
<properties>
12-
<log4j.version>2.26.0</log4j.version>
12+
<log4j.version>2.26.1</log4j.version>
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<aspectj.version>1.9.20.1</aspectj.version>

examples/powertools-examples-parameters/sam-graalvm/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<name>Powertools for AWS Lambda (Java) - Examples - Parameters GraalVM</name>
99

1010
<properties>
11-
<log4j.version>2.26.0</log4j.version>
11+
<log4j.version>2.26.1</log4j.version>
1212
<maven.compiler.source>11</maven.compiler.source>
1313
<maven.compiler.target>11</maven.compiler.target>
1414
<aspectj.version>1.9.20.1</aspectj.version>

0 commit comments

Comments
 (0)