Skip to content

Commit a24ac32

Browse files
committed
Merge remote-tracking branch 'origin/main' into develop
2 parents 442ca30 + 9a5450a commit a24ac32

File tree

48 files changed

+725
-158
lines changed

Some content is hidden

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

48 files changed

+725
-158
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"

.github/workflows/aws-lambda-java-core.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ on:
77
push:
88
branches: [ main ]
99
paths:
10-
- 'aws-lambda-java-core/**'
10+
- 'aws-lambda-java-core/**'
1111
pull_request:
1212
branches: [ '*' ]
1313
paths:
14-
- 'aws-lambda-java-core/**'
14+
- 'aws-lambda-java-core/**'
15+
- '.github/workflows/aws-lambda-java-core.yml'
1516

1617
jobs:
1718
build:
@@ -21,7 +22,7 @@ jobs:
2122
steps:
2223
- uses: actions/checkout@v3
2324
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2526
with:
2627
java-version: 8
2728
distribution: corretto
@@ -38,3 +39,5 @@ jobs:
3839
- name: Run 'pr' target
3940
working-directory: ./aws-lambda-java-runtime-interface-client
4041
run: make pr
42+
env:
43+
IS_JAVA_8: true

.github/workflows/aws-lambda-java-events-sdk-transformer.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ on:
77
push:
88
branches: [ main ]
99
paths:
10-
- 'aws-lambda-java-events-sdk-transformer/**'
10+
- 'aws-lambda-java-events-sdk-transformer/**'
1111
pull_request:
1212
branches: [ '*' ]
1313
paths:
14-
- 'aws-lambda-java-events-sdk-transformer/**'
14+
- 'aws-lambda-java-events-sdk-transformer/**'
15+
- '.github/workflows/aws-lambda-java-events-sdk-transformer.yml'
1516

1617
jobs:
1718
build:
@@ -21,7 +22,7 @@ jobs:
2122
steps:
2223
- uses: actions/checkout@v3
2324
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2526
with:
2627
java-version: 8
2728
distribution: corretto

.github/workflows/aws-lambda-java-events.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ on:
77
push:
88
branches: [ main ]
99
paths:
10-
- 'aws-lambda-java-events/**'
10+
- 'aws-lambda-java-events/**'
1111
pull_request:
1212
branches: [ '*' ]
1313
paths:
14-
- 'aws-lambda-java-events/**'
14+
- 'aws-lambda-java-events/**'
15+
- '.github/workflows/aws-lambda-java-events.yml'
1516

1617
jobs:
1718
build:
@@ -21,7 +22,7 @@ jobs:
2122
steps:
2223
- uses: actions/checkout@v3
2324
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2526
with:
2627
java-version: 8
2728
distribution: corretto

.github/workflows/aws-lambda-java-log4j2.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ on:
77
push:
88
branches: [ main ]
99
paths:
10-
- 'aws-lambda-java-log4j2/**'
10+
- 'aws-lambda-java-log4j2/**'
1111
pull_request:
1212
branches: [ '*' ]
1313
paths:
14-
- 'aws-lambda-java-log4j2/**'
14+
- 'aws-lambda-java-log4j2/**'
15+
- '.github/workflows/aws-lambda-java-log4j2.yml'
1516

1617
jobs:
1718
build:
@@ -21,7 +22,7 @@ jobs:
2122
steps:
2223
- uses: actions/checkout@v3
2324
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2526
with:
2627
java-version: 8
2728
distribution: corretto

.github/workflows/aws-lambda-java-serialization.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ on:
77
push:
88
branches: [ main ]
99
paths:
10-
- 'aws-lambda-java-serialization/**'
10+
- 'aws-lambda-java-serialization/**'
1111
pull_request:
1212
branches: [ '*' ]
1313
paths:
14-
- 'aws-lambda-java-serialization/**'
14+
- 'aws-lambda-java-serialization/**'
15+
- '.github/workflows/aws-lambda-java-serialization.yml'
1516

1617
jobs:
1718
build:
@@ -21,7 +22,7 @@ jobs:
2122
steps:
2223
- uses: actions/checkout@v3
2324
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2526
with:
2627
java-version: 8
2728
distribution: corretto

.github/workflows/aws-lambda-java-tests.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ on:
77
push:
88
branches: [ main ]
99
paths:
10-
- 'aws-lambda-java-tests/**'
10+
- 'aws-lambda-java-tests/**'
1111
pull_request:
1212
branches: [ '*' ]
1313
paths:
14-
- 'aws-lambda-java-tests/**'
14+
- 'aws-lambda-java-tests/**'
15+
- '.github/workflows/aws-lambda-java-tests.yml'
1516

1617
jobs:
1718
build:
@@ -21,7 +22,7 @@ jobs:
2122
steps:
2223
- uses: actions/checkout@v3
2324
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2526
with:
2627
java-version: 8
2728
distribution: corretto

.github/workflows/repo-sync.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ name: Repo Sync
33
on:
44
schedule:
55
- cron: "0 8 * * 1-5" # At 08:00 on every day-of-week from Monday through Friday
6+
pull_request:
7+
branches: [ '*' ]
8+
paths:
9+
- '.github/workflows/repo-sync.yml'
610
workflow_dispatch:
711

812
jobs:

.github/workflows/runtime-interface-client_merge_to_main.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
branches: [ main ]
1616
paths:
1717
- 'aws-lambda-java-runtime-interface-client/**'
18+
workflow_dispatch:
1819

1920
jobs:
2021

@@ -29,13 +30,13 @@ jobs:
2930
- uses: actions/checkout@v3
3031

3132
- name: Set up JDK 1.8
32-
uses: actions/setup-java@v3
33+
uses: actions/setup-java@v4
3334
with:
3435
java-version: 8
3536
distribution: corretto
3637

3738
- name: Set up QEMU
38-
uses: docker/setup-qemu-action@v2
39+
uses: docker/setup-qemu-action@v3
3940

4041
- name: Set up Docker Buildx
4142
uses: docker/setup-buildx-action@v2
@@ -48,9 +49,11 @@ jobs:
4849
- name: Test Runtime Interface Client xplatform build - Run 'build' target
4950
working-directory: ./aws-lambda-java-runtime-interface-client
5051
run: make build
52+
env:
53+
IS_JAVA_8: true
5154

5255
- name: Issue AWS credentials
53-
uses: aws-actions/configure-aws-credentials@v1
56+
uses: aws-actions/configure-aws-credentials@v4
5457
with:
5558
aws-region: ${{ secrets.AWS_REGION }}
5659
role-to-assume: ${{ secrets.AWS_ROLE }}

.github/workflows/runtime-interface-client_pr.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ on:
77
pull_request:
88
branches: [ '*' ]
99
paths:
10-
- 'aws-lambda-java-runtime-interface-client/**'
10+
- 'aws-lambda-java-runtime-interface-client/**'
11+
- '.github/workflows/runtime-interface-client_pr.yml'
1112

1213
jobs:
1314

@@ -17,28 +18,30 @@ jobs:
1718
- uses: actions/checkout@v3
1819

1920
- name: Set up JDK 1.8
20-
uses: actions/setup-java@v3
21+
uses: actions/setup-java@v4
2122
with:
2223
java-version: 8
2324
distribution: corretto
2425

2526
- name: Runtime Interface Client smoke tests - Run 'pr' target
2627
working-directory: ./aws-lambda-java-runtime-interface-client
2728
run: make pr
29+
env:
30+
IS_JAVA_8: true
2831

2932
build:
3033
runs-on: ubuntu-latest
3134
steps:
3235
- uses: actions/checkout@v3
3336

3437
- name: Set up JDK 1.8
35-
uses: actions/setup-java@v3
38+
uses: actions/setup-java@v4
3639
with:
3740
java-version: 8
3841
distribution: corretto
3942

4043
- name: Set up QEMU
41-
uses: docker/setup-qemu-action@v2
44+
uses: docker/setup-qemu-action@v3
4245

4346
- name: Set up Docker Buildx
4447
uses: docker/setup-buildx-action@v2
@@ -51,9 +54,11 @@ jobs:
5154
- name: Test Runtime Interface Client xplatform build - Run 'build' target
5255
working-directory: ./aws-lambda-java-runtime-interface-client
5356
run: make build
57+
env:
58+
IS_JAVA_8: true
5459

5560
- name: Save the built jar
56-
uses: actions/upload-artifact@v3
61+
uses: actions/upload-artifact@v4
5762
with:
5863
name: aws-lambda-java-runtime-interface-client
5964
path: ./aws-lambda-java-runtime-interface-client/target/aws-lambda-java-runtime-interface-client-*.jar

.github/workflows/samples.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
branches: [ '*' ]
1313
paths:
1414
- 'samples/kinesis-firehose-event-handler/**'
15+
- '.github/workflows/samples.yml'
1516

1617
jobs:
1718
build:
@@ -21,7 +22,7 @@ jobs:
2122
steps:
2223
- uses: actions/checkout@v3
2324
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2526
with:
2627
java-version: 8
2728
distribution: corretto

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@ dependency-reduced-pom.xml
2424
.project
2525

2626
# OSX
27-
.DS_Store
27+
.DS_Store
28+
29+
# snapshot process
30+
aws-lambda-java-runtime-interface-client/pom.xml.versionsBackup

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public class SqsHandler implements RequestHandler<SQSEvent, String> {
7171
<dependency>
7272
<groupId>com.amazonaws</groupId>
7373
<artifactId>aws-lambda-java-events</artifactId>
74-
<version>3.11.5</version>
74+
<version>3.11.6</version>
7575
</dependency>
7676
```
7777

@@ -140,7 +140,7 @@ The purpose of this package is to allow developers to deploy their applications
140140
<dependency>
141141
<groupId>com.amazonaws</groupId>
142142
<artifactId>aws-lambda-java-runtime-interface-client</artifactId>
143-
<version>2.5.0</version>
143+
<version>2.5.1</version>
144144
</dependency>
145145
```
146146

aws-lambda-java-events/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>com.amazonaws</groupId>
7272
<artifactId>aws-lambda-java-events</artifactId>
73-
<version>3.11.5</version>
73+
<version>3.11.6</version>
7474
</dependency>
7575
...
7676
</dependencies>

aws-lambda-java-events/RELEASE.CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### June 11, 2024
2+
`3.11.6`:
3+
- Add the V2 version of the pre token generation event([#465](https://github.com/aws/aws-lambda-java-libs/pull/465))
4+
15
### April 12, 2024
26
`3.11.5`:
37
- Add requestHeaders field for Appsync lambda authorizer event([#473](https://github.com/aws/aws-lambda-java-libs/pull/473))

aws-lambda-java-events/pom.xml

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

66
<groupId>com.amazonaws</groupId>
77
<artifactId>aws-lambda-java-events</artifactId>
8-
<version>3.11.5</version>
8+
<version>3.11.6</version>
99
<packaging>jar</packaging>
1010

1111
<name>AWS Lambda Java Events Library</name>

0 commit comments

Comments
 (0)