Skip to content

Commit a5f2c8b

Browse files
committed
Merge branch 'main' into phipag/issue2283
2 parents ebbc903 + 464490d commit a5f2c8b

File tree

76 files changed

+1245
-408
lines changed

Some content is hidden

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

76 files changed

+1245
-408
lines changed

.github/workflows/check-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ on:
4747
- 'powertools-large-messages/**'
4848
- 'powertools-logging/**'
4949
- 'powertools-metrics/**'
50+
- 'powertools-kafka/**'
5051
- 'powertools-parameters/**'
5152
- 'powertools-serialization/**'
5253
- 'powertools-sqs/**'
@@ -72,6 +73,7 @@ jobs:
7273
- 11
7374
- 17
7475
- 21
76+
- 25
7577
steps:
7678
- id: checkout
7779
name: Checkout repository

.github/workflows/security-dependencies-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ jobs:
2626
- name: Checkout Repository
2727
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2828
- name: Verify Contents
29-
uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # v4.8.1
29+
uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
3030
with:
3131
config-file: './.github/dependency-review-config.yml'

README.md

Lines changed: 11 additions & 9 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.6.0</version>
25+
<version>2.7.0</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>software.amazon.lambda</groupId>
29-
<artifactId>powertools-logging</artifactId>
30-
<version>2.6.0</version>
29+
<artifactId>powertools-logging-log4j</artifactId>
30+
<version>2.7.0</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>software.amazon.lambda</groupId>
3434
<artifactId>powertools-metrics</artifactId>
35-
<version>2.6.0</version>
35+
<version>2.7.0</version>
3636
</dependency>
3737
...
3838
</dependencies>
@@ -116,6 +116,7 @@ Next, configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lam
116116
aspect 'software.amazon.lambda:powertools-logging:{{ powertools.version }}'
117117
aspect 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}'
118118
aspect 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}'
119+
implementation 'software.amazon.lambda:powertools-logging-log4j:{{ powertools.version }}'
119120
implementation "org.aspectj:aspectjrt:1.9.22"
120121
}
121122
@@ -126,10 +127,10 @@ Next, configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lam
126127

127128

128129
### Java Compatibility
129-
Powertools for AWS Lambda (Java) supports all Java version from 11 up to 21 as well as the
130-
[corresponding Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html).
130+
Powertools for AWS Lambda (Java) supports all Java versions from 11 to 25 in line with the [corresponding Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html).
131+
131132
For the modules that provide annotations, Powertools for AWS Lambda (Java) leverages the **aspectj** library.
132-
You may need to add the good version of `aspectjrt` to your dependencies based on the JDK used for building your function:
133+
You may need to add the appropriate version of `aspectjrt` to your dependencies based on the JDK used for building your function:
133134

134135
```xml
135136
<dependency>
@@ -142,12 +143,13 @@ You may need to add the good version of `aspectjrt` to your dependencies based o
142143
<details>
143144
<summary><b>JDK - aspectj dependency matrix</b></summary>
144145

146+
Use the following [dependency matrix](https://github.com/eclipse-aspectj/aspectj/blob/master/docs/release/JavaVersionCompatibility.adoc) to understand which AspectJ version to use based on your JDK version:
147+
145148
| JDK version | aspectj version |
146149
|-------------|------------------------|
147150
| `11-17` | `1.9.20.1` (or higher) |
148151
| `21` | `1.9.21` (or higher) |
149-
150-
More info [here](https://github.com/aws-powertools/powertools-lambda-java/pull/1519/files#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R191).
152+
| `25` | `1.9.25` (or higher) |
151153

152154
</details>
153155

docs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM squidfunk/mkdocs-material@sha256:58dee36ad85b0ae4836522ee6d3f0150d828bca9a1f7d3bfbf430bca771c1441
1+
FROM squidfunk/mkdocs-material@sha256:980e11fed03b8e7851e579be9f34b1210f516c9f0b4da1a1457f21a460bd6628
22

33
COPY requirements.txt /tmp/
44
RUN pip install --require-hashes -r /tmp/requirements.txt

docs/FAQs.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ description: Frequently Asked Questions
77

88
Many utilities in this library use `aspectj-maven-plugin` to compile-time weave (CTW) aspects into the project. In case you want to use `Lombok` or other compile-time preprocessor for your project, it is required to change `aspectj-maven-plugin` configuration to enable in-place weaving feature. Otherwise the plugin will ignore changes introduced by `Lombok` and will use `.java` files as a source.
99

10+
Alternatively, you can use the [functional approach](./usage-patterns.md#functional-approach) which does not require AspectJ configuration.
11+
1012
To enable in-place weaving feature you need to use following `aspectj-maven-plugin` configuration:
1113

1214
```xml hl_lines="2-6"
@@ -31,6 +33,8 @@ To enable in-place weaving feature you need to use following `aspectj-maven-plug
3133
Many utilities use `aspectj-maven-plugin` to compile-time weave (CTW) aspects into the project. When using it with Kotlin projects, it is required to `forceAjcCompile`.
3234
No explicit configuration should be required for gradle projects.
3335

36+
Alternatively, you can use the [functional approach](./usage-patterns.md#functional-approach) which does not require AspectJ configuration.
37+
3438
To enable `forceAjcCompile` you need to use following `aspectj-maven-plugin` configuration:
3539

3640
```xml hl_lines="2"

0 commit comments

Comments
 (0)