Skip to content

Commit 8b2dba4

Browse files
subhash686subhash686
authored
Merge branch 'main' into support_crac_on_powertools_metrics
2 parents 7ba4cfa + 8b6d484 commit 8b2dba4

File tree

119 files changed

+8053
-105
lines changed

Some content is hidden

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

119 files changed

+8053
-105
lines changed

‎.github/branch_protection_settings/1.x.x.json‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/1.x.x/protection",
3+
"required_status_checks": {
4+
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/1.x.x/protection/required_status_checks",
5+
"strict": true,
6+
"contexts": [
7+
"SonarCloud"
8+
],
9+
"contexts_url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/1.x.x/protection/required_status_checks/contexts",
10+
"checks": [
11+
{
12+
"context": "SonarCloud",
13+
"app_id": null
14+
}
15+
]
16+
},
17+
"required_pull_request_reviews": {
18+
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/1.x.x/protection/required_pull_request_reviews",
19+
"dismiss_stale_reviews": false,
20+
"require_code_owner_reviews": false,
21+
"require_last_push_approval": false,
22+
"required_approving_review_count": 0
23+
},
24+
"required_signatures": {
25+
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/1.x.x/protection/required_signatures",
26+
"enabled": false
27+
},
28+
"enforce_admins": {
29+
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/1.x.x/protection/enforce_admins",
30+
"enabled": true
31+
},
32+
"required_linear_history": {
33+
"enabled": false
34+
},
35+
"allow_force_pushes": {
36+
"enabled": false
37+
},
38+
"allow_deletions": {
39+
"enabled": false
40+
},
41+
"block_creations": {
42+
"enabled": false
43+
},
44+
"required_conversation_resolution": {
45+
"enabled": false
46+
},
47+
"lock_branch": {
48+
"enabled": false
49+
},
50+
"allow_fork_syncing": {
51+
"enabled": false
52+
}
53+
}

‎.github/branch_protection_settings/main.json‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,44 @@
33
"required_status_checks": {
44
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/required_status_checks",
55
"strict": true,
6-
"contexts": [
7-
"SonarCloud"
8-
],
6+
"contexts": [],
97
"contexts_url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/required_status_checks/contexts",
10-
"checks": [
11-
{
12-
"context": "SonarCloud",
13-
"app_id": 57789
14-
}
15-
]
8+
"checks": []
9+
},
10+
"restrictions": {
11+
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/restrictions",
12+
"users_url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/restrictions/users",
13+
"teams_url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/restrictions/teams",
14+
"apps_url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/restrictions/apps",
15+
"users": [],
16+
"teams": [],
17+
"apps": []
1618
},
1719
"required_pull_request_reviews": {
1820
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/required_pull_request_reviews",
19-
"dismiss_stale_reviews": false,
21+
"dismiss_stale_reviews": true,
2022
"require_code_owner_reviews": false,
21-
"require_last_push_approval": false,
22-
"required_approving_review_count": 0
23+
"require_last_push_approval": true,
24+
"required_approving_review_count": 1,
25+
"dismissal_restrictions": {
26+
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/dismissal_restrictions",
27+
"users_url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/dismissal_restrictions/users",
28+
"teams_url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/dismissal_restrictions/teams",
29+
"users": [],
30+
"teams": [],
31+
"apps": []
32+
}
2333
},
2434
"required_signatures": {
2535
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/required_signatures",
2636
"enabled": false
2737
},
2838
"enforce_admins": {
2939
"url": "https://api.github.com/repos/aws-powertools/powertools-lambda-java/branches/main/protection/enforce_admins",
30-
"enabled": true
40+
"enabled": false
3141
},
3242
"required_linear_history": {
33-
"enabled": false
43+
"enabled": true
3444
},
3545
"allow_force_pushes": {
3646
"enabled": false
@@ -39,10 +49,10 @@
3949
"enabled": false
4050
},
4151
"block_creations": {
42-
"enabled": false
52+
"enabled": true
4353
},
4454
"required_conversation_resolution": {
45-
"enabled": false
55+
"enabled": true
4656
},
4757
"lock_branch": {
4858
"enabled": false

‎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.0.0</version>
25+
<version>2.1.1</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>software.amazon.lambda</groupId>
2929
<artifactId>powertools-logging</artifactId>
30-
<version>2.0.0</version>
30+
<version>2.1.1</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>software.amazon.lambda</groupId>
3434
<artifactId>powertools-metrics</artifactId>
35-
<version>2.0.0</version>
35+
<version>2.1.1</version>
3636
</dependency>
3737
...
3838
</dependencies>

‎docs/processes/versioning.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ To see the list of available major versions of Powertools for AWS Lambda and whe
5555

5656
### Version support matrix
5757

58-
| SDK | Major version | Current Phase | General Availability Date | Notes |
59-
| -------------------------------- | ------------- | -------------------- | ------------------------- | ------------------------------------------------------------------------------------------------- |
60-
| Powertools for AWS Lambda (Java) | 1.x | General Availability | 11/04/2020 | See [Release notes](https://github.com/aws-powertools/powertools-lambda-java/releases/tag/v1.0.0) |
58+
| SDK | Major version | Current Phase | General Availability Date | Notes |
59+
| -------------------------------- | ------------- | -------------------- | ------------------------- | ------------------------------------------------------------------------------------------------------------------- |
60+
| Powertools for AWS Lambda (Java) | 2.x | General Availability | 06/12/2025 | See [Release notes](https://github.com/aws-powertools/powertools-lambda-java/releases/tag/v2.0.0) |
61+
| Powertools for AWS Lambda (Java) | 1.x | Maintenance | 11/04/2020 | End-of-support: December 12, 2025. See [upgrade guide](https://docs.powertools.aws.dev/lambda/java/latest/upgrade/) |

‎docs/upgrade.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ description: Guide to update between major Powertools for AWS Lambda (Java) vers
55

66
## End of support v1
77

8-
<!-- TODO: Add end of support banner here once developer preview started. -->
8+
<!-- prettier-ignore-start -->
9+
!!! warning "End of support notice"
10+
On December 12th, 2025, Powertools for AWS Lambda (Java) v1 will reach end of support and will no longer receive updates or releases. If you are still using v1, we strongly recommend you to read our upgrade guide and update to the latest version.
11+
<!-- prettier-ignore-end -->
912

1013
Given our commitment to all of our customers using Powertools for AWS Lambda (Java), we will keep [Maven Central](https://central.sonatype.com/search?q=powertools){target="\_blank"} `v1` releases and a `v1` documentation archive to prevent any disruption.
1114

0 commit comments

Comments
 (0)