Skip to content

Commit 3115ba7

Browse files
phipagphipag
committed
Fix outdated AspectJ configuration in documentation pages.
1 parent ea43772 commit 3115ba7

File tree

9 files changed

+111
-25
lines changed

9 files changed

+111
-25
lines changed

‎README.md‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Powertools for AWS Lambda (Java) is a developer toolkit to implement Serverless
99

1010
> Also available in [Python](https://github.com/aws-powertools/powertools-lambda-python), [TypeScript](https://github.com/aws-powertools/powertools-lambda-typescript), and [.NET](https://github.com/aws-powertools/powertools-lambda-dotnet).
1111
12-
**[📜Documentation](https://docs.powertools.aws.dev/lambda-java/)** | **[Feature request](https://github.com/aws-powertools/powertools-lambda-java/issues/new?assignees=&labels=feature-request%2C+triage&template=feature_request.md&title=)** | **[🐛Bug Report](https://github.com/aws-powertools/powertools-lambda-java/issues/new?assignees=&labels=bug%2C+triage&template=bug_report.md&title=)** | **[Detailed blog post](https://aws.amazon.com/blogs/opensource/simplifying-serverless-best-practices-with-aws-lambda-powertools-java/)**
12+
**[📜Documentation](https://docs.powertools.aws.dev/lambda-java/preview)** | **[Feature request](https://github.com/aws-powertools/powertools-lambda-java/issues/new?assignees=&labels=feature-request%2C+triage&template=feature_request.md&title=)** | **[🐛Bug Report](https://github.com/aws-powertools/powertools-lambda-java/issues/new?assignees=&labels=bug%2C+triage&template=bug_report.md&title=)** | **[Detailed blog post](https://aws.amazon.com/blogs/opensource/simplifying-serverless-best-practices-with-aws-lambda-powertools-java/)**
1313

1414
## Installation
1515

@@ -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>1.18.0</version>
25+
<version>2.0.0-SNAPSHOT</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>software.amazon.lambda</groupId>
2929
<artifactId>powertools-logging</artifactId>
30-
<version>1.18.0</version>
30+
<version>2.0.0-SNAPSHOT</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>software.amazon.lambda</groupId>
3434
<artifactId>powertools-metrics</artifactId>
35-
<version>1.18.0</version>
35+
<version>2.0.0-SNAPSHOT</version>
3636
</dependency>
3737
...
3838
</dependencies>
@@ -50,7 +50,7 @@ Next, configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lam
5050
<plugin>
5151
<groupId>dev.aspectj</groupId>
5252
<artifactId>aspectj-maven-plugin</artifactId>
53-
<version>1.13.1</version>
53+
<version>1.14</version>
5454
<configuration>
5555
<source>11</source>
5656
<target>11</target>
@@ -70,6 +70,14 @@ Next, configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lam
7070
</aspectLibrary>
7171
</aspectLibraries>
7272
</configuration>
73+
<dependencies>
74+
<dependency>
75+
<groupId>org.aspectj</groupId>
76+
<artifactId>aspectjtools</artifactId>
77+
<!-- AspectJ compiler version, in sync with runtime -->
78+
<version>1.9.22</version>
79+
</dependency>
80+
</dependencies>
7381
<executions>
7482
<execution>
7583
<goals>
@@ -108,7 +116,7 @@ Next, configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lam
108116
aspect 'software.amazon.lambda:powertools-logging:{{ powertools.version }}'
109117
aspect 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}'
110118
aspect 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}'
111-
implementation "org.aspectj:aspectjrt:1.9.8.RC3"
119+
implementation "org.aspectj:aspectjrt:1.9.22"
112120
}
113121
114122
sourceCompatibility = 11
@@ -134,10 +142,10 @@ You may need to add the good version of `aspectjrt` to your dependencies based o
134142
<details>
135143
<summary><b>JDK - aspectj dependency matrix</b></summary>
136144

137-
| JDK version | aspectj version |
138-
|-------------|-----------------|
139-
| `11-17` | `1.9.20.1` |
140-
| `21` | `1.9.21` |
145+
| JDK version | aspectj version |
146+
|-------------|------------------------|
147+
| `11-17` | `1.9.20.1` (or higher) |
148+
| `21` | `1.9.21` (or higher) |
141149

142150
More info [here](https://github.com/aws-powertools/powertools-lambda-java/pull/1519/files#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R191).
143151

‎docs/core/logging.md‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ to weave the code and make sure the annotation is processed.
4545
<plugin>
4646
<groupId>dev.aspectj</groupId>
4747
<artifactId>aspectj-maven-plugin</artifactId>
48-
<version>1.13.1</version>
48+
<version>1.14</version>
4949
<configuration>
5050
<source>11</source> <!-- or higher -->
5151
<target>11</target> <!-- or higher -->
@@ -57,6 +57,14 @@ to weave the code and make sure the annotation is processed.
5757
</aspectLibrary>
5858
</aspectLibraries>
5959
</configuration>
60+
<dependencies>
61+
<dependency>
62+
<groupId>org.aspectj</groupId>
63+
<artifactId>aspectjtools</artifactId>
64+
<!-- AspectJ compiler version, in sync with runtime -->
65+
<version>1.9.22</version>
66+
</dependency>
67+
</dependencies>
6068
<executions>
6169
<execution>
6270
<goals>
@@ -90,7 +98,7 @@ to weave the code and make sure the annotation is processed.
9098
<plugin>
9199
<groupId>dev.aspectj</groupId>
92100
<artifactId>aspectj-maven-plugin</artifactId>
93-
<version>1.13.1</version>
101+
<version>1.14</version>
94102
<configuration>
95103
<source>11</source> <!-- or higher -->
96104
<target>11</target> <!-- or higher -->
@@ -102,6 +110,14 @@ to weave the code and make sure the annotation is processed.
102110
</aspectLibrary>
103111
</aspectLibraries>
104112
</configuration>
113+
<dependencies>
114+
<dependency>
115+
<groupId>org.aspectj</groupId>
116+
<artifactId>aspectjtools</artifactId>
117+
<!-- AspectJ compiler version, in sync with runtime -->
118+
<version>1.9.22</version>
119+
</dependency>
120+
</dependencies>
105121
<executions>
106122
<execution>
107123
<goals>

‎docs/core/metrics.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ If you're new to Amazon CloudWatch, there are two terminologies you must be awar
4848
<plugin>
4949
<groupId>dev.aspectj</groupId>
5050
<artifactId>aspectj-maven-plugin</artifactId>
51-
<version>1.13.1</version>
51+
<version>1.14</version>
5252
<configuration>
5353
<source>11</source> <!-- or higher -->
5454
<target>11</target> <!-- or higher -->
@@ -60,6 +60,14 @@ If you're new to Amazon CloudWatch, there are two terminologies you must be awar
6060
</aspectLibrary>
6161
</aspectLibraries>
6262
</configuration>
63+
<dependencies>
64+
<dependency>
65+
<groupId>org.aspectj</groupId>
66+
<artifactId>aspectjtools</artifactId>
67+
<!-- AspectJ compiler version, in sync with runtime -->
68+
<version>1.9.22</version>
69+
</dependency>
70+
</dependencies>
6371
<executions>
6472
<execution>
6573
<goals>

‎docs/core/tracing.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ a provides functionality to reduce the overhead of performing common tracing tas
3737
<plugin>
3838
<groupId>dev.aspectj</groupId>
3939
<artifactId>aspectj-maven-plugin</artifactId>
40-
<version>1.13.1</version>
40+
<version>1.14</version>
4141
<configuration>
4242
<source>11</source> <!-- or higher -->
4343
<target>11</target> <!-- or higher -->
@@ -49,6 +49,14 @@ a provides functionality to reduce the overhead of performing common tracing tas
4949
</aspectLibrary>
5050
</aspectLibraries>
5151
</configuration>
52+
<dependencies>
53+
<dependency>
54+
<groupId>org.aspectj</groupId>
55+
<artifactId>aspectjtools</artifactId>
56+
<!-- AspectJ compiler version, in sync with runtime -->
57+
<version>1.9.22</version>
58+
</dependency>
59+
</dependencies>
5260
<executions>
5361
<execution>
5462
<goals>

‎docs/index.md‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ Powertools for AWS Lambda (Java) dependencies are available in Maven Central. Yo
106106
<artifactId>powertools-metrics</artifactId>
107107
<version>{{ powertools.version }}</version>
108108
</dependency>
109+
<!-- Make sure to include AspectJ runtime compatible with plugin version -->
110+
<dependency>
111+
<groupId>org.aspectj</groupId>
112+
<artifactId>aspectjrt</artifactId>
113+
<version>1.9.22</version>
114+
</dependency>
109115
...
110116
</dependencies>
111117
...
@@ -116,7 +122,7 @@ Powertools for AWS Lambda (Java) dependencies are available in Maven Central. Yo
116122
<plugin>
117123
<groupId>dev.aspectj</groupId>
118124
<artifactId>aspectj-maven-plugin</artifactId>
119-
<version>1.13.1</version>
125+
<version>1.14</version>
120126
<configuration>
121127
<source>11</source> <!-- or higher -->
122128
<target>11</target> <!-- or higher -->
@@ -136,6 +142,14 @@ Powertools for AWS Lambda (Java) dependencies are available in Maven Central. Yo
136142
</aspectLibrary>
137143
</aspectLibraries>
138144
</configuration>
145+
<dependencies>
146+
<dependency>
147+
<groupId>org.aspectj</groupId>
148+
<artifactId>aspectjtools</artifactId>
149+
<!-- AspectJ compiler version, in sync with runtime -->
150+
<version>1.9.22</version>
151+
</dependency>
152+
</dependencies>
139153
<executions>
140154
<execution>
141155
<goals>
@@ -211,10 +225,10 @@ You may need to add the good version of `aspectjrt` to your dependencies based o
211225

212226
Use the following [dependency matrix](https://github.com/eclipse-aspectj/aspectj/blob/master/docs/dist/doc/JavaVersionCompatibility.md) between this library and the JDK:
213227

214-
| JDK version | aspectj version |
215-
|-------------|-----------------|
216-
| `11-17` | `1.9.20.1` |
217-
| `21` | `1.9.21` |
228+
| JDK version | aspectj version |
229+
|-------------|------------------------|
230+
| `11-17` | `1.9.20.1` (or higher) |
231+
| `21` | `1.9.21` (or higher) |
218232

219233
## Environment variables
220234

‎docs/utilities/idempotency.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ times with the same parameters**. This makes idempotent operations safe to retry
4747
<plugin>
4848
<groupId>dev.aspectj</groupId>
4949
<artifactId>aspectj-maven-plugin</artifactId>
50-
<version>1.13.1</version>
50+
<version>1.14</version>
5151
<configuration>
5252
<source>11</source> <!-- or higher -->
5353
<target>11</target> <!-- or higher -->
@@ -59,6 +59,14 @@ times with the same parameters**. This makes idempotent operations safe to retry
5959
</aspectLibrary>
6060
</aspectLibraries>
6161
</configuration>
62+
<dependencies>
63+
<dependency>
64+
<groupId>org.aspectj</groupId>
65+
<artifactId>aspectjtools</artifactId>
66+
<!-- AspectJ compiler version, in sync with runtime -->
67+
<version>1.9.22</version>
68+
</dependency>
69+
</dependencies>
6270
<executions>
6371
<execution>
6472
<goals>

‎docs/utilities/large_messages.md‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ of amazon-sns-java-extended-client-lib.
114114
<plugin>
115115
<groupId>dev.aspectj</groupId>
116116
<artifactId>aspectj-maven-plugin</artifactId>
117-
<version>1.13.1</version>
117+
<version>1.14</version>
118118
<configuration>
119119
<source>11</source> <!-- or higher -->
120120
<target>11</target> <!-- or higher -->
@@ -126,6 +126,14 @@ of amazon-sns-java-extended-client-lib.
126126
</aspectLibrary>
127127
</aspectLibraries>
128128
</configuration>
129+
<dependencies>
130+
<dependency>
131+
<groupId>org.aspectj</groupId>
132+
<artifactId>aspectjtools</artifactId>
133+
<!-- AspectJ compiler version, in sync with runtime -->
134+
<version>1.9.22</version>
135+
</dependency>
136+
</dependencies>
129137
<executions>
130138
<execution>
131139
<goals>
@@ -344,4 +352,4 @@ If you need to customize this `S3Client`, you can leverage the `LargeMessageConf
344352
It gives more control, especially when dealing with partial failures with SQS (see the batch module).
345353
- The new module only provides an annotation, an equivalent to the `SqsUtils` class is not available anymore in this new version.
346354

347-
Finally, if you are still using the `powertools-sqs` library for batch processing, consider moving to `powertools-batch` at the same time to remove the dependency on this library completely; it has been deprecated and will be removed in v2.
355+
Finally, if you are still using the `powertools-sqs` library for batch processing, consider moving to `powertools-batch` at the same time to remove the dependency on this library completely; it has been deprecated and will be removed in v2.

‎docs/utilities/parameters.md‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Note that you must provide the concrete parameters module you want to use below
5454
<plugin>
5555
<groupId>dev.aspectj</groupId>
5656
<artifactId>aspectj-maven-plugin</artifactId>
57-
<version>1.13.1</version>
57+
<version>1.14</version>
5858
<configuration>
5959
<source>11</source> <!-- or higher -->
6060
<target>11</target> <!-- or higher -->
@@ -67,6 +67,14 @@ Note that you must provide the concrete parameters module you want to use below
6767
</aspectLibrary>
6868
</aspectLibraries>
6969
</configuration>
70+
<dependencies>
71+
<dependency>
72+
<groupId>org.aspectj</groupId>
73+
<artifactId>aspectjtools</artifactId>
74+
<!-- AspectJ compiler version, in sync with runtime -->
75+
<version>1.9.22</version>
76+
</dependency>
77+
</dependencies>
7078
<executions>
7179
<execution>
7280
<goals>
@@ -604,4 +612,4 @@ You can create your own custom parameter store provider by implementing a handfu
604612
}
605613

606614
}
607-
```
615+
```

‎docs/utilities/validation.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This utility provides JSON Schema validation for payloads held within events and
3232
<plugin>
3333
<groupId>dev.aspectj</groupId>
3434
<artifactId>aspectj-maven-plugin</artifactId>
35-
<version>1.13.1</version>
35+
<version>1.14</version>
3636
<configuration>
3737
<source>11</source> <!-- or higher -->
3838
<target>11</target> <!-- or higher -->
@@ -44,6 +44,14 @@ This utility provides JSON Schema validation for payloads held within events and
4444
</aspectLibrary>
4545
</aspectLibraries>
4646
</configuration>
47+
<dependencies>
48+
<dependency>
49+
<groupId>org.aspectj</groupId>
50+
<artifactId>aspectjtools</artifactId>
51+
<!-- AspectJ compiler version, in sync with runtime -->
52+
<version>1.9.22</version>
53+
</dependency>
54+
</dependencies>
4755
<executions>
4856
<execution>
4957
<goals>

0 commit comments

Comments
 (0)