Skip to content

Commit 0fd2ecf

Browse files
mricciamriccia
authored
chore: Swap implementation of aspectj-maven-plugin to support Java 17 (#1172)
1 parent db32719 commit 0fd2ecf

File tree

16 files changed

+42
-31
lines changed

16 files changed

+42
-31
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ And configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lambd
4343
<plugins>
4444
...
4545
<plugin>
46-
<groupId>org.codehaus.mojo</groupId>
46+
<groupId>dev.aspectj</groupId>
4747
<artifactId>aspectj-maven-plugin</artifactId>
48-
<version>1.14.0</version>
48+
<version>1.13.1</version>
4949
<configuration>
5050
<source>1.8</source>
5151
<target>1.8</target>

‎docs/index.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ For more information about the project and available options refer to this [repo
7171
<plugins>
7272
...
7373
<plugin>
74-
<groupId>org.codehaus.mojo</groupId>
74+
<groupId>dev.aspectj</groupId>
7575
<artifactId>aspectj-maven-plugin</artifactId>
76-
<version>1.14.0</version>
76+
<version>1.13.1</version>
7777
<configuration>
7878
<source>1.8</source>
7979
<target>1.8</target>
@@ -122,6 +122,8 @@ For more information about the project and available options refer to this [repo
122122
aspect 'software.amazon.lambda:powertools-logging:{{ powertools.version }}'
123123
aspect 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}'
124124
aspect 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}'
125+
// This dependency is needed for Java17+, please uncomment it if you are using Java17+
126+
// implementation 'org.aspectj:aspectjrt:1.9.19'
125127
}
126128

127129
sourceCompatibility = 11

‎docs/utilities/batch.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ To install this utility, add the following dependency to your project.
4141
<plugins>
4242
...
4343
<plugin>
44-
<groupId>org.codehaus.mojo</groupId>
44+
<groupId>dev.aspectj</groupId>
4545
<artifactId>aspectj-maven-plugin</artifactId>
46-
<version>1.14.0</version>
46+
<version>1.13.1</version>
4747
<configuration>
4848
<source>1.8</source>
4949
<target>1.8</target>
@@ -83,6 +83,8 @@ To install this utility, add the following dependency to your project.
8383
dependencies {
8484
...
8585
aspect 'software.amazon.lambda:powertools-sqs:{{ powertools.version }}'
86+
// This dependency is needed for Java17+, please uncomment it if you are using Java17+
87+
// implementation 'org.aspectj:aspectjrt:1.9.19'
8688
}
8789
```
8890

‎docs/utilities/idempotency.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ times with the same parameters**. This makes idempotent operations safe to retry
4343
<plugins>
4444
...
4545
<plugin>
46-
<groupId>org.codehaus.mojo</groupId>
46+
<groupId>dev.aspectj</groupId>
4747
<artifactId>aspectj-maven-plugin</artifactId>
48-
<version>1.14.0</version>
48+
<version>1.13.1</version>
4949
<configuration>
5050
<source>1.8</source>
5151
<target>1.8</target>

‎docs/utilities/parameters.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ To install this utility, add the following dependency to your project.
3434
dependencies {
3535
...
3636
aspect 'software.amazon.lambda:powertools-parameters:{{ powertools.version }}'
37+
// This dependency is needed for Java17+, please uncomment it if you are using Java17+
38+
// implementation 'org.aspectj:aspectjrt:1.9.19'
3739
}
3840
```
3941

@@ -441,9 +443,9 @@ If you want to use the ```@Param``` annotation in your project add configuration
441443
<plugins>
442444
...
443445
<plugin>
444-
<groupId>org.codehaus.mojo</groupId>
446+
<groupId>dev.aspectj</groupId>
445447
<artifactId>aspectj-maven-plugin</artifactId>
446-
<version>1.14.0</version>
448+
<version>1.13.1</version>
447449
<configuration>
448450
...
449451
<aspectLibraries>
@@ -482,5 +484,6 @@ If you want to use the ```@Param``` annotation in your project add configuration
482484
dependencies {
483485
...
484486
aspect 'software.amazon.lambda:powertools-parameters:{{ powertools.version }}'
487+
implementation 'org.aspectj:aspectjrt:1.9.19'
485488
}
486489
```

‎docs/utilities/sqs_large_message_handling.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ To install this utility, add the following dependency to your project.
4949
<plugins>
5050
...
5151
<plugin>
52-
<groupId>org.codehaus.mojo</groupId>
52+
<groupId>dev.aspectj</groupId>
5353
<artifactId>aspectj-maven-plugin</artifactId>
54-
<version>1.14.0</version>
54+
<version>1.13.1</version>
5555
<configuration>
5656
<source>1.8</source>
5757
<target>1.8</target>
@@ -91,6 +91,8 @@ To install this utility, add the following dependency to your project.
9191
dependencies {
9292
...
9393
aspect 'software.amazon.lambda:powertools-sqs:{{ powertools.version }}'
94+
// This dependency is needed for Java17+, please uncomment it if you are using Java17+
95+
// implementation 'org.aspectj:aspectjrt:1.9.19'
9496
}
9597
```
9698

‎docs/utilities/validation.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ To install this utility, add the following dependency to your project.
3131
<plugins>
3232
...
3333
<plugin>
34-
<groupId>org.codehaus.mojo</groupId>
34+
<groupId>dev.aspectj</groupId>
3535
<artifactId>aspectj-maven-plugin</artifactId>
36-
<version>1.14.0</version>
36+
<version>1.13.1</version>
3737
<configuration>
3838
<source>1.8</source>
3939
<target>1.8</target>
@@ -72,6 +72,8 @@ To install this utility, add the following dependency to your project.
7272

7373
dependencies {
7474
aspect 'software.amazon.lambda:powertools-validation:{{ powertools.version }}'
75+
// This dependency is needed for Java17+, please uncomment it if you are using Java17+
76+
// implementation 'org.aspectj:aspectjrt:1.9.19'
7577
}
7678
```
7779

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
<build>
6060
<plugins>
6161
<plugin>
62-
<groupId>org.codehaus.mojo</groupId>
62+
<groupId>dev.aspectj</groupId>
6363
<artifactId>aspectj-maven-plugin</artifactId>
64-
<version>1.14.0</version>
64+
<version>1.13.1</version>
6565
<configuration>
6666
<source>${maven.compiler.source}</source>
6767
<target>${maven.compiler.target}</target>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
<build>
7777
<plugins>
7878
<plugin>
79-
<groupId>org.codehaus.mojo</groupId>
79+
<groupId>dev.aspectj</groupId>
8080
<artifactId>aspectj-maven-plugin</artifactId>
81-
<version>1.14.0</version>
81+
<version>1.13.1</version>
8282
<configuration>
8383
<source>${maven.compiler.source}</source>
8484
<target>${maven.compiler.target}</target>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
<version>3.1.0</version>
6464
</plugin>
6565
<plugin>
66-
<groupId>org.codehaus.mojo</groupId>
66+
<groupId>dev.aspectj</groupId>
6767
<artifactId>aspectj-maven-plugin</artifactId>
68-
<version>1.14.0</version>
68+
<version>1.13.1</version>
6969
<configuration>
7070
<source>${maven.compiler.source}</source>
7171
<target>${maven.compiler.target}</target>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
<build>
6565
<plugins>
6666
<plugin>
67-
<groupId>org.codehaus.mojo</groupId>
67+
<groupId>dev.aspectj</groupId>
6868
<artifactId>aspectj-maven-plugin</artifactId>
69-
<version>1.14.0</version>
69+
<version>1.13.1</version>
7070
<configuration>
7171
<source>${maven.compiler.source}</source>
7272
<target>${maven.compiler.target}</target>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
<version>3.1.0</version>
5959
</plugin>
6060
<plugin>
61-
<groupId>org.codehaus.mojo</groupId>
61+
<groupId>dev.aspectj</groupId>
6262
<artifactId>aspectj-maven-plugin</artifactId>
63-
<version>1.14.0</version>
63+
<version>1.13.1</version>
6464
<configuration>
6565
<source>${maven.compiler.source}</source>
6666
<target>${maven.compiler.target}</target>

‎pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<lambda.events.version>3.11.1</lambda.events.version>
6969
<lambda.serial.version>1.1.2</lambda.serial.version>
7070
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
71-
<aspectj-maven-plugin.version>1.14.0</aspectj-maven-plugin.version>
71+
<aspectj-maven-plugin.version>1.13.1</aspectj-maven-plugin.version>
7272
<maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
7373
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
7474
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
@@ -307,7 +307,7 @@
307307
<version>${maven-compiler-plugin.version}</version>
308308
</plugin>
309309
<plugin>
310-
<groupId>org.codehaus.mojo</groupId>
310+
<groupId>dev.aspectj</groupId>
311311
<artifactId>aspectj-maven-plugin</artifactId>
312312
<version>${aspectj-maven-plugin.version}</version>
313313
</plugin>
@@ -354,7 +354,7 @@
354354
</configuration>
355355
</plugin>
356356
<plugin>
357-
<groupId>org.codehaus.mojo</groupId>
357+
<groupId>dev.aspectj</groupId>
358358
<artifactId>aspectj-maven-plugin</artifactId>
359359
<version>${aspectj-maven-plugin.version}</version>
360360
<configuration>

‎powertools-e2e-tests/handlers/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<lambda.java.core>1.2.2</lambda.java.core>
1919
<lambda.java.events>3.11.0</lambda.java.events>
2020
<maven.shade.version>3.2.4</maven.shade.version>
21-
<aspectj.version>1.14.0</aspectj.version>
21+
<aspectj.version>1.13.1</aspectj.version>
2222
<maven.compiler.version>3.10.1</maven.compiler.version>
2323
</properties>
2424

‎powertools-serialization/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<build>
7676
<plugins>
7777
<plugin>
78-
<groupId>org.codehaus.mojo</groupId>
78+
<groupId>dev.aspectj</groupId>
7979
<artifactId>aspectj-maven-plugin</artifactId>
8080
<version>${aspectj-maven-plugin.version}</version>
8181
<configuration>

‎powertools-test-suite/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@
115115
<build>
116116
<plugins>
117117
<plugin>
118-
<groupId>org.codehaus.mojo</groupId>
118+
<groupId>dev.aspectj</groupId>
119119
<artifactId>aspectj-maven-plugin</artifactId>
120-
<version>1.14.0</version>
120+
<version>1.13.1</version>
121121
<configuration>
122122
<source>${maven.compiler.source}</source>
123123
<target>${maven.compiler.target}</target>

0 commit comments

Comments
 (0)