Skip to content

Commit 044e5e1

Browse files
authored
Merge branch 'aws-powertools:main' into feature/support_crac_on_powertools_large_messages
2 parents 9e2c4ab + 05c041a commit 044e5e1

9 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/check-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
name: Checkout repository
8282
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
8383
- name: Setup Java
84-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654
84+
uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287
8585
with:
8686
distribution: corretto
8787
java-version: ${{ matrix.java }}

.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@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
110110
- name: Setup java
111-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
111+
uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
112112
with:
113113
distribution: 'corretto'
114114
java-version: ${{ matrix.java }}
@@ -146,7 +146,7 @@ jobs:
146146
steps:
147147
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
148148
- name: Setup java
149-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
149+
uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.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@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3131
- name: Setup Java
32-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
32+
uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.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@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4646
- name: Setup Java
47-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
47+
uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
4848
with:
4949
distribution: 'corretto'
5050
java-version: 21

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
contents: write # required for creating draft releases
2424
steps:
2525
- name: Relase Drafter
26-
uses: release-drafter/release-drafter@693d20e7c1ce1a81d3a41962f85914253b518449
26+
uses: release-drafter/release-drafter@ed4bc48ec97379be2258e7b7ac2624a3e26ab809
2727
env:
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.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@be666c2fcd27ec809703dec50e508c2fdc7f6654
140+
uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287
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@be666c2fcd27ec809703dec50e508c2fdc7f6654
177+
uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287
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@be666c2fcd27ec809703dec50e508c2fdc7f6654
202+
uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287
203203
with:
204204
distribution: corretto
205205
java-version: 21

examples/powertools-examples-kafka/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<maven.compiler.target>11</maven.compiler.target>
1313
<aspectj.version>1.9.20.1</aspectj.version>
1414
<avro.version>1.12.1</avro.version>
15-
<protobuf.version>4.34.1</protobuf.version>
15+
<protobuf.version>4.35.0</protobuf.version>
1616
</properties>
1717

1818
<dependencies>

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:5345a7b86cd7c91164cfa8d52e5de57adc8ffebca594d11f8a7ffa359596608f
2+
FROM public.ecr.aws/sam/build-java25@sha256:2c465765e28036cc11b8db29baf0f06fad200a7e73a7211bf7169a46d4081228
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

powertools-kafka/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<properties>
3737
<kafka-clients.version>4.2.0</kafka-clients.version>
3838
<avro.version>1.12.1</avro.version>
39-
<protobuf.version>4.34.1</protobuf.version>
39+
<protobuf.version>4.35.0</protobuf.version>
4040
<lambda-serialization.version>1.3.1</lambda-serialization.version>
4141
</properties>
4242

0 commit comments

Comments
 (0)