Skip to content

Commit 954b77b

Browse files
authored
Merge branch 'main' into eventsv4 (#388)
1 parent a96539a commit 954b77b

File tree

51 files changed

+546
-556
lines changed

Some content is hidden

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

51 files changed

+546
-556
lines changed

Diff for: .github/workflows/aws-lambda-java-core.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-core
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
paths:
1010
- 'aws-lambda-java-core/**'
1111
pull_request:
@@ -19,11 +19,12 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@v3
2525
with:
26-
java-version: 1.8
26+
java-version: 8
27+
distribution: corretto
2728

2829
# Install base module
2930
- name: Install core with Maven

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-events-sdk-transformer
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
paths:
1010
- 'aws-lambda-java-events-sdk-transformer/**'
1111
pull_request:
@@ -19,11 +19,12 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@v3
2525
with:
26-
java-version: 1.8
26+
java-version: 8
27+
distribution: corretto
2728

2829
# Install base module
2930
- name: Install serialization with Maven

Diff for: .github/workflows/aws-lambda-java-events.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-events
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
paths:
1010
- 'aws-lambda-java-events/**'
1111
pull_request:
@@ -19,11 +19,12 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@v3
2525
with:
26-
java-version: 1.8
26+
java-version: 8
27+
distribution: corretto
2728

2829
# Install required module
2930
- name: Install serialization with Maven

Diff for: .github/workflows/aws-lambda-java-log4j2.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-log4j2
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
paths:
1010
- 'aws-lambda-java-log4j2/**'
1111
pull_request:
@@ -19,11 +19,12 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@v3
2525
with:
26-
java-version: 1.8
26+
java-version: 8
27+
distribution: corretto
2728

2829
# Install base module
2930
- name: Install core with Maven

Diff for: .github/workflows/aws-lambda-java-runtime-interface-client.yml

+12-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-runtime-interface-client
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
paths:
1010
- 'aws-lambda-java-runtime-interface-client/**'
1111
pull_request:
@@ -18,12 +18,13 @@ jobs:
1818
smoke-test:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2222

2323
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@v3
2525
with:
26-
java-version: 1.8
26+
java-version: 8
27+
distribution: corretto
2728

2829
- name: Runtime Interface Client smoke tests - Run 'pr' target
2930
working-directory: ./aws-lambda-java-runtime-interface-client
@@ -32,18 +33,19 @@ jobs:
3233
build:
3334
runs-on: ubuntu-latest
3435
steps:
35-
- uses: actions/checkout@v2
36+
- uses: actions/checkout@v3
3637

3738
- name: Set up JDK 1.8
38-
uses: actions/setup-java@v1
39+
uses: actions/setup-java@v3
3940
with:
40-
java-version: 1.8
41+
java-version: 8
42+
distribution: corretto
4143

4244
- name: Set up QEMU
43-
uses: docker/setup-qemu-action@v1
45+
uses: docker/setup-qemu-action@v2
4446

4547
- name: Set up Docker Buildx
46-
uses: docker/setup-buildx-action@v1
48+
uses: docker/setup-buildx-action@v2
4749
with:
4850
install: true
4951

@@ -58,5 +60,5 @@ jobs:
5860
uses: actions/upload-artifact@v3
5961
with:
6062
name: the-jar
61-
path: ./aws-lambda-java-runtime-interface-client/target/aws-lambda-java-runtime-interface-client-2.1.0.jar
63+
path: ./aws-lambda-java-runtime-interface-client/target/aws-lambda-java-runtime-interface-client-*.jar
6264

Diff for: .github/workflows/aws-lambda-java-serialization.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-serialization
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
paths:
1010
- 'aws-lambda-java-serialization/**'
1111
pull_request:
@@ -19,16 +19,17 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@v3
2525
with:
26-
java-version: 1.8
26+
java-version: 8
27+
distribution: corretto
2728

2829
# Package target module
2930
- name: Install serialization with Maven
3031
run: mvn -B install --file aws-lambda-java-serialization/pom.xml
3132
# Install base module
3233
- name: Install events with Maven
3334
run: mvn -B install --file aws-lambda-java-events/pom.xml
34-
35+

Diff for: .github/workflows/aws-lambda-java-tests.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-tests
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
paths:
1010
- 'aws-lambda-java-tests/**'
1111
pull_request:
@@ -19,11 +19,12 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@v3
2525
with:
26-
java-version: 1.8
26+
java-version: 8
27+
distribution: corretto
2728

2829
# Install base module
2930
- name: Install serialization with Maven

Diff for: .github/workflows/samples.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Java CI samples
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
paths:
1010
- 'samples/kinesis-firehose-event-handler/**'
1111
pull_request:
@@ -19,11 +19,12 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v1
24+
uses: actions/setup-java@v3
2525
with:
26-
java-version: 1.8
26+
java-version: 8
27+
distribution: corretto
2728

2829
# Install events module
2930
- name: Install events with Maven

Diff for: .gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,7 @@ dependency-reduced-pom.xml
2121
.gradle
2222
.settings
2323
.classpath
24-
.project
24+
.project
25+
26+
# OSX
27+
.DS_Store

0 commit comments

Comments
 (0)