Skip to content

Commit 7aed484

Browse files
phipagphipag
committed
Merge branch 'main' into phipag/logging-imperative-style
2 parents 21df606 + 07db631 commit 7aed484

File tree

65 files changed

+1199
-354
lines changed

Some content is hidden

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

65 files changed

+1199
-354
lines changed

‎.chglog/CHANGELOG.tpl.md‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<!-- changelog is partially generated, so it doesn't follow headings and required structure, so we disable it. -->
2+
<!-- markdownlint-disable -->
3+
4+
{{ if .Versions -}}
5+
<a name="unreleased"></a>
6+
# Unreleased
7+
8+
{{ if .Unreleased.CommitGroups -}}
9+
{{ range .Unreleased.CommitGroups -}}
10+
## {{ .Title }}
11+
12+
{{ range .Commits -}}
13+
{{ if and (not (hasPrefix .Subject "changelog rebuild")) (not (hasPrefix .Subject "layer docs update")) (not (hasPrefix .Subject "bump version to")) -}}
14+
* {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
15+
{{ end -}}
16+
{{ end }}
17+
{{ end -}}
18+
{{ end -}}
19+
{{ end -}}
20+
21+
{{ range .Versions }}
22+
<a name="{{ .Tag.Name }}"></a>
23+
## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
24+
{{ range .CommitGroups -}}
25+
26+
## {{ .Title }}
27+
28+
{{ range .Commits -}}
29+
{{ if and (not (hasPrefix .Subject "changelog rebuild")) (not (hasPrefix .Subject "layer docs update")) (not (hasPrefix .Subject "bump version to")) -}}
30+
* {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
31+
{{ end -}}
32+
{{ end }}
33+
{{ end -}}
34+
35+
{{- if .RevertCommits -}}
36+
## Reverts
37+
{{ range .RevertCommits -}}
38+
* {{ .Revert.Header }}
39+
{{ end }}
40+
{{ end -}}
41+
42+
{{- if .MergeCommits -}}
43+
## Pull Requests
44+
45+
{{ range .MergeCommits -}}
46+
* {{ .Header }}
47+
{{ end }}
48+
{{ end -}}
49+
50+
{{- if .NoteGroups -}}
51+
{{ range .NoteGroups -}}
52+
## {{ .Title }}
53+
{{ range .Notes }}
54+
{{ .Body }}
55+
{{ end }}
56+
{{ end -}}
57+
{{ end -}}
58+
{{ end -}}
59+
60+
{{- if .Versions }}
61+
[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD
62+
{{ range .Versions -}}
63+
{{ if .Tag.Previous -}}
64+
[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
65+
{{ end -}}
66+
{{ end -}}
67+
{{ end -}}

‎.chglog/config.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
style: github
2+
template: CHANGELOG.tpl.md
3+
info:
4+
title: CHANGELOG
5+
repository_url: https://github.com/aws-powertools/powertools-lambda-java
6+
options:
7+
commits:
8+
filters:
9+
Type:
10+
- feat
11+
- fix
12+
- perf
13+
- refactor
14+
- docs
15+
- chore
16+
- revert
17+
commit_groups:
18+
title_maps:
19+
feat: Features
20+
fix: Bug Fixes
21+
perf: Performance Improvements
22+
refactor: Code Refactoring
23+
docs: Documentation
24+
chore: Maintenance
25+
revert: Regression
26+
header:
27+
pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$"
28+
pattern_maps:
29+
- Type
30+
- Scope
31+
- Subject
32+
notes:
33+
keywords:
34+
- BREAKING CHANGE
35+
# issues:
36+
# prefix:
37+
# - #

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,16 @@ jobs:
239239
git config user.email "[email protected]"
240240
git config pull.rebase true
241241
git config remote.origin.url >&-
242+
- id: tag
243+
name: Create tag
244+
run: |
245+
git tag -a v${{ inputs.version }} -m "Release v${{ inputs.version }}"
246+
git push origin v${{ inputs.version }}
242247
- id: branch
243-
name: Create branch
248+
name: Create branch and update change log
244249
run: |
245250
git checkout -b ci-${{ github.run_id }}
251+
docker run -v "${PWD}":/workdir quay.io/git-chglog/git-chglog@sha256:c791b1e8264387690cce4ce32e18b4f59ca3ffd8d55cb4093dc6de74529493f4 > CHANGELOG.md
246252
git commit -am "chore(ci): bump version to ${{ inputs.version }}"
247253
git push origin ci-${{ github.run_id }}
248254
- id: create_pr
@@ -253,11 +259,6 @@ jobs:
253259
--body "This is an automated PR created from the following workflow: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
254260
env:
255261
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
256-
- id: tag
257-
name: Create tag
258-
run: |
259-
git tag -a v${{ inputs.version }} -m "Release v${{ inputs.version }}"
260-
git push origin v${{ inputs.version }}
261262

262263
docs:
263264
runs-on: ubuntu-latest

‎.github/workflows/security-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ jobs:
5252
path: results.sarif
5353
retention-days: 5
5454
- name: Upload to Code-Scanning
55-
uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
55+
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
5656
with:
5757
sarif_file: results.sarif

‎CHANGELOG.md‎

Lines changed: 1015 additions & 278 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ Powertools for AWS Lambda (Java) is available in Maven Central. You can use your
2222
<dependency>
2323
<groupId>software.amazon.lambda</groupId>
2424
<artifactId>powertools-tracing</artifactId>
25-
<version>2.4.0</version>
25+
<version>2.5.0</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>software.amazon.lambda</groupId>
2929
<artifactId>powertools-logging</artifactId>
30-
<version>2.4.0</version>
30+
<version>2.5.0</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>software.amazon.lambda</groupId>
3434
<artifactId>powertools-metrics</artifactId>
35-
<version>2.4.0</version>
35+
<version>2.5.0</version>
3636
</dependency>
3737
...
3838
</dependencies>

‎examples/pom.xml‎

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

2121
<groupId>software.amazon.lambda</groupId>
2222
<artifactId>powertools-examples</artifactId>
23-
<version>2.4.0</version>
23+
<version>2.5.0</version>
2424
<packaging>pom</packaging>
2525

2626
<name>Powertools for AWS Lambda (Java) - Examples</name>

‎examples/powertools-examples-batch/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>software.amazon.lambda.examples</groupId>
8-
<version>2.4.0</version>
8+
<version>2.5.0</version>
99
<artifactId>powertools-examples-batch</artifactId>
1010
<packaging>jar</packaging>
1111
<name>Powertools for AWS Lambda (Java) - Examples - Batch</name>

‎examples/powertools-examples-cloudformation/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Run the following in your shell:
1515
```bash
1616
cd infra/sam
1717
sam build
18-
sam deploy --guided --parameter-overrides BucketNameParam=my-unique-bucket-2.4.0718
18+
sam deploy --guided --parameter-overrides BucketNameParam=my-unique-bucket-2.5.0718
1919
```
2020

2121
### Deploy with CDK
@@ -32,5 +32,5 @@ To build and deploy this application for the first time, run the following in yo
3232
cd infra/cdk
3333
mvn package
3434
cdk synth
35-
cdk deploy -c BucketNameParam=my-unique-bucket-2.4.0718
35+
cdk deploy -c BucketNameParam=my-unique-bucket-2.5.0718
3636
```

‎examples/powertools-examples-cloudformation/infra/sam-graalvm/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ sam build
4040
## Deploy the sample application
4141

4242
```shell
43-
sam deploy --guided --parameter-overrides BucketNameParam=my-unique-bucket-2.4.0718
43+
sam deploy --guided --parameter-overrides BucketNameParam=my-unique-bucket-2.5.0718
4444
```
4545

4646
This sample is based on Serverless Application Model (SAM). To deploy it, check out the instructions for getting started with SAM in [the examples directory](../../../README.md)

0 commit comments

Comments
 (0)