Skip to content

Commit a060b3e

Browse files
authored
Merge branch 'main' into report-artifacts-size
2 parents e6e8330 + 44c4c75 commit a060b3e

File tree

63 files changed

+1017
-166
lines changed

Some content is hidden

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

63 files changed

+1017
-166
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ assignees: ''
3939
* **AWS Lambda function runtime:**
4040
* **Debugging logs**
4141

42-
> [How to enable debug mode](https://awslabs.github.io/aws-lambda-powertools-java/#debug-mode)**
42+
> [How to enable debug mode](https://docs.powertools.aws.dev/lambda-java/#debug-mode)**
4343
4444
```text
4545
# paste logs here

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Ask a question
4-
url: https://github.com/awslabs/aws-lambda-powertools-java/discussions/new
4+
url: https://github.com/aws-powertools/powertools-lambda-java/discussions/new
55
about: Ask a general question about Lambda Powertools

.github/ISSUE_TEMPLATE/maintenance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ body:
5555
attributes:
5656
label: Acknowledgment
5757
options:
58-
- label: This request meets [Powertools for AWS Lambda (Java) Tenets](https://awslabs.github.io/aws-lambda-powertools-java/#tenets)
58+
- label: This request meets [Powertools for AWS Lambda (Java) Tenets](https://docs.powertools.aws.dev/lambda-java/#tenets)
5959
required: true
60-
- label: Should this be considered in other Powertools for AWS Lambda (Java) languages? i.e. [Python](https://github.com/awslabs/aws-lambda-powertools-python/), [TypeScript](https://github.com/awslabs/aws-lambda-powertools-typescript/)
60+
- label: Should this be considered in other Powertools for AWS Lambda (Java) languages? i.e. [Python](https://github.com/aws-powertools/powertools-lambda-python/), [TypeScript](https://github.com/aws-powertools/powertools-lambda-typescript/)
6161
required: false
6262
- type: markdown
6363
attributes:

.github/ISSUE_TEMPLATE/rfc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ assignees: ''
1212
* RFC PR: (leave this empty)
1313
* Related issue(s), if known:
1414
* Area: (i.e. Tracer, Metrics, Logger, etc.)
15-
* Meet [tenets](https://awslabs.github.io/aws-lambda-powertools-java/#tenets): (Yes/no)
15+
* Meet [tenets](https://docs.powertools.aws.dev/lambda-java/#tenets): (Yes/no)
1616

1717
## Summary
1818
[summary]: #summary

.github/PULL_REQUEST_TEMPLATE.md

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

99
<!--- Leave unchecked if your change doesn't seem to apply -->
1010

11-
* [ ] [Meet tenets criteria](https://awslabs.github.io/aws-lambda-powertools-java/#tenets)
11+
* [ ] [Meet tenets criteria](https://docs.powertools.aws.dev/lambda-java/#tenets)
1212
* [ ] Update tests
1313
* [ ] Update docs
1414
* [ ] PR title follows [conventional commit semantics](https://www.conventionalcommits.org/en/v1.0.0/)

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ updates:
99
- "dependencies"
1010
ignore:
1111
# Ignore Mockito 5.X.X as it does not support Java 8
12-
- dependency-name: mockito-*
12+
- dependency-name: "org.mockito:mockito-*"
1313
update-types: ["version-update:semver-major"]

.github/workflows/build-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name: Build Docs
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- main
77
paths:
88
- 'docs/**'
99
- 'mkdocs.yml'
1010
- 'Makefile'
1111

1212
push:
1313
branches:
14-
- master
14+
- main
1515
paths:
1616
- 'docs/**'
1717
- 'mkdocs.yml'

.github/workflows/build.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- main
77
paths:
88
- 'powertools-cloudformation/**'
99
- 'powertools-core/**'
@@ -23,7 +23,7 @@ on:
2323
- '.github/workflows/**'
2424
push:
2525
branches:
26-
- master
26+
- main
2727
paths:
2828
- 'powertools-cloudformation/**'
2929
- 'powertools-core/**'
@@ -42,30 +42,29 @@ on:
4242
- 'examples/pom.xml'
4343
- '.github/workflows/**'
4444
jobs:
45-
build:
45+
build-corretto:
4646
runs-on: ubuntu-latest
4747
strategy:
48-
max-parallel: 4
48+
max-parallel: 5
4949
matrix:
50-
# test against latest update of each major Java version, as well as specific updates of LTS versions:
51-
java: [8, 8.0.192, 11.0.x, 11.0.3, 12, 13, 15, 16, 17 ]
50+
java: [8, 11, 15, 16, 17, 18, 19, 20 ]
5251
name: Java ${{ matrix.java }}
5352
env:
5453
JAVA: ${{ matrix.java }}
5554
AWS_REGION: eu-west-1
5655
steps:
5756
- uses: actions/checkout@v3
5857
- name: Setup java
59-
uses: actions/setup-java@v2
58+
uses: actions/setup-java@v3
6059
with:
61-
distribution: 'zulu'
60+
distribution: 'corretto'
6261
java-version: ${{ matrix.java }}
6362
cache: 'maven'
6463
- name: Build with Maven
6564
run: mvn -Pbuild-without-spotbugs -B package artifact:buildinfo --file pom.xml
6665
- name: Upload coverage to Codecov
6766
uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # 3.1.1
68-
if: ${{ matrix.java == '11.0.x' }} # publish results once
67+
if: ${{ matrix.java == '11' }} # publish results once
6968
with:
7069
files: ./powertools-cloudformation/target/site/jacoco/jacoco.xml,./powertools-core/target/site/jacoco/jacoco.xml,./powertools-idempotency/target/site/jacoco/jacoco.xml,./powertools-logging/target/site/jacoco/jacoco.xml,./powertools-metrics/target/site/jacoco/jacoco.xml,./powertools-parameters/target/site/jacoco/jacoco.xml,./powertools-serialization/target/site/jacoco/jacoco.xml,./powertools-sqs/target/site/jacoco/jacoco.xml,./powertools-tracing/target/site/jacoco/jacoco.xml,./powertools-validation/target/site/jacoco/jacoco.xml
7170
- name: Get artifacts size & build report

.github/workflows/docs.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ jobs:
2929
- name: Build docs website
3030
run: |
3131
make build-docs-website
32-
- name: Deploy all docs
33-
uses: peaceiris/actions-gh-pages@v3
34-
with:
35-
github_token: ${{ secrets.GITHUB_TOKEN }}
36-
publish_dir: ./dist
3732
- name: Configure AWS credentials
3833
uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef
3934
with:

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
# branches to consider in the event; optional, defaults to all
66
branches:
7-
- master
7+
- main
88

99
jobs:
1010
update_release_draft:

.github/workflows/release-prep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ jobs:
7575
delete-branch: true
7676
title: chore:Prep release ${{ github.event.inputs.targetRelease }}
7777
body: |
78-
This is automated release prep. Remember to update [CHANGELOG.md](https://github.com/awslabs/aws-lambda-powertools-java/blob/prep-release-${{ github.event.inputs.targetRelease }}/CHANGELOG.md) to capture changes in this release. Please review changes carefully before merging.
78+
This is automated release prep. Remember to update [CHANGELOG.md](https://github.com/aws-powertools/powertools-lambda-java/blob/prep-release-${{ github.event.inputs.targetRelease }}/CHANGELOG.md) to capture changes in this release. Please review changes carefully before merging.
7979
8080
* [ ] Updated CHANGELOG.md

.github/workflows/run-e2e-tests.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Run end-to-end tests
2+
3+
on:
4+
workflow_dispatch:
5+
6+
push:
7+
branches: [main]
8+
paths: # add other modules when there are under e2e tests
9+
- 'powertools-e2e-tests/**'
10+
- 'powertools-core/**'
11+
- 'powertools-serialization/**'
12+
- 'powertools-logging/**'
13+
- 'powertools-tracing/**'
14+
- 'powertools-idempotency/**'
15+
- 'powertools-parameters/**'
16+
- 'powertools-metrics/**'
17+
- 'pom.xml'
18+
- '.github/workflows/**'
19+
20+
jobs:
21+
e2e:
22+
runs-on: ubuntu-latest
23+
strategy:
24+
max-parallel: 3
25+
matrix:
26+
java: [ 8, 11, 17 ]
27+
name: End-to-end tests java${{ matrix.java }}
28+
env:
29+
JAVA_VERSION: ${{ matrix.java }}
30+
AWS_DEFAULT_REGION: eu-west-1
31+
permissions:
32+
id-token: write # needed to interact with GitHub's OIDC Token endpoint.
33+
contents: read
34+
steps:
35+
- uses: actions/checkout@v3
36+
- name: Setup java
37+
uses: actions/setup-java@v3
38+
with:
39+
distribution: 'corretto'
40+
java-version: ${{ matrix.java }}
41+
cache: maven
42+
- name: Setup AWS credentials
43+
uses: aws-actions/[email protected]
44+
with:
45+
role-to-assume: ${{ secrets.AWS_ROLE_ARN_TO_ASSUME }}
46+
aws-region: ${{ env.AWS_DEFAULT_REGION }}
47+
- name: Run e2e test with Maven
48+
run: mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml

.github/workflows/spotbugs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: SpotBugs
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- main
77
paths:
88
- 'powertools-cloudformation/**'
99
- 'powertools-core/**'

0 commit comments

Comments
 (0)