From 205445f7a0eb56742b4f5473b580196bd7c1a655 Mon Sep 17 00:00:00 2001
From: Michele Ricciardi <mriccia@amazon.com>
Date: Thu, 1 Jun 2023 16:32:19 +0200
Subject: [PATCH 1/4] chore: swap implementation of `aspectj-maven-plugin` to
 support Java 17 projects

---
 README.md                                         | 4 ++--
 docs/index.md                                     | 4 ++--
 docs/utilities/batch.md                           | 4 ++--
 docs/utilities/idempotency.md                     | 4 ++--
 docs/utilities/parameters.md                      | 4 ++--
 docs/utilities/sqs_large_message_handling.md      | 4 ++--
 docs/utilities/validation.md                      | 4 ++--
 examples/powertools-examples-core/pom.xml         | 4 ++--
 examples/powertools-examples-idempotency/pom.xml  | 4 ++--
 examples/powertools-examples-parameters/pom.xml   | 4 ++--
 examples/powertools-examples-sqs/pom.xml          | 4 ++--
 examples/powertools-examples-validation/pom.xml   | 4 ++--
 pom.xml                                           | 6 +++---
 powertools-e2e-tests/handlers/idempotency/pom.xml | 2 +-
 powertools-e2e-tests/handlers/logging/pom.xml     | 2 +-
 powertools-e2e-tests/handlers/metrics/pom.xml     | 2 +-
 powertools-e2e-tests/handlers/pom.xml             | 4 ++--
 powertools-e2e-tests/handlers/tracing/pom.xml     | 2 +-
 powertools-serialization/pom.xml                  | 2 +-
 powertools-test-suite/pom.xml                     | 4 ++--
 20 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index b13e05f6c..04a0ad288 100644
--- a/README.md
+++ b/README.md
@@ -43,9 +43,9 @@ And configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lambd
     <plugins>
         ...
         <plugin>
-             <groupId>org.codehaus.mojo</groupId>
+             <groupId>dev.aspectj</groupId>
              <artifactId>aspectj-maven-plugin</artifactId>
-             <version>1.14.0</version>
+             <version>1.13.1</version>
              <configuration>
                  <source>1.8</source>
                  <target>1.8</target>
diff --git a/docs/index.md b/docs/index.md
index f595c1b65..9c3f73233 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -71,9 +71,9 @@ For more information about the project and available options refer to this [repo
         <plugins>
             ...
             <plugin>
-                 <groupId>org.codehaus.mojo</groupId>
+                 <groupId>dev.aspectj</groupId>
                  <artifactId>aspectj-maven-plugin</artifactId>
-                 <version>1.14.0</version>
+                 <version>1.13.1</version>
                  <configuration>
                      <source>1.8</source>
                      <target>1.8</target>
diff --git a/docs/utilities/batch.md b/docs/utilities/batch.md
index 1c3586360..acedf4f91 100644
--- a/docs/utilities/batch.md
+++ b/docs/utilities/batch.md
@@ -41,9 +41,9 @@ To install this utility, add the following dependency to your project.
         <plugins>
             ...
             <plugin>
-                 <groupId>org.codehaus.mojo</groupId>
+                 <groupId>dev.aspectj</groupId>
                  <artifactId>aspectj-maven-plugin</artifactId>
-                 <version>1.14.0</version>
+                 <version>1.13.1</version>
                  <configuration>
                      <source>1.8</source>
                      <target>1.8</target>
diff --git a/docs/utilities/idempotency.md b/docs/utilities/idempotency.md
index 5a1a0e468..d8ec13e9d 100644
--- a/docs/utilities/idempotency.md
+++ b/docs/utilities/idempotency.md
@@ -43,9 +43,9 @@ times with the same parameters**. This makes idempotent operations safe to retry
         <plugins>
             ...
             <plugin>
-                 <groupId>org.codehaus.mojo</groupId>
+                 <groupId>dev.aspectj</groupId>
                  <artifactId>aspectj-maven-plugin</artifactId>
-                 <version>1.14.0</version>
+                 <version>1.13.1</version>
                  <configuration>
                      <source>1.8</source>
                      <target>1.8</target>
diff --git a/docs/utilities/parameters.md b/docs/utilities/parameters.md
index e8df1f8d6..96fb41d04 100644
--- a/docs/utilities/parameters.md
+++ b/docs/utilities/parameters.md
@@ -441,9 +441,9 @@ If you want to use the ```@Param``` annotation in your project add configuration
         <plugins>
             ...
             <plugin>
-                 <groupId>org.codehaus.mojo</groupId>
+                 <groupId>dev.aspectj</groupId>
                  <artifactId>aspectj-maven-plugin</artifactId>
-                 <version>1.14.0</version>
+                 <version>1.13.1</version>
                  <configuration>
                      ...
                      <aspectLibraries>
diff --git a/docs/utilities/sqs_large_message_handling.md b/docs/utilities/sqs_large_message_handling.md
index 65c4b7b4d..5e100188b 100644
--- a/docs/utilities/sqs_large_message_handling.md
+++ b/docs/utilities/sqs_large_message_handling.md
@@ -49,9 +49,9 @@ To install this utility, add the following dependency to your project.
         <plugins>
             ...
             <plugin>
-                 <groupId>org.codehaus.mojo</groupId>
+                 <groupId>dev.aspectj</groupId>
                  <artifactId>aspectj-maven-plugin</artifactId>
-                 <version>1.14.0</version>
+                 <version>1.13.1</version>
                  <configuration>
                      <source>1.8</source>
                      <target>1.8</target>
diff --git a/docs/utilities/validation.md b/docs/utilities/validation.md
index c51f905aa..0d8f26c4e 100644
--- a/docs/utilities/validation.md
+++ b/docs/utilities/validation.md
@@ -31,9 +31,9 @@ To install this utility, add the following dependency to your project.
         <plugins>
             ...
             <plugin>
-                 <groupId>org.codehaus.mojo</groupId>
+                 <groupId>dev.aspectj</groupId>
                  <artifactId>aspectj-maven-plugin</artifactId>
-                 <version>1.14.0</version>
+                 <version>1.13.1</version>
                  <configuration>
                      <source>1.8</source>
                      <target>1.8</target>
diff --git a/examples/powertools-examples-core/pom.xml b/examples/powertools-examples-core/pom.xml
index 4bc41d35f..b66b2cdbd 100644
--- a/examples/powertools-examples-core/pom.xml
+++ b/examples/powertools-examples-core/pom.xml
@@ -59,9 +59,9 @@
     <build>
       <plugins>
         <plugin>
-             <groupId>org.codehaus.mojo</groupId>
+             <groupId>dev.aspectj</groupId>
              <artifactId>aspectj-maven-plugin</artifactId>
-             <version>1.14.0</version>
+             <version>1.13.1</version>
              <configuration>
                  <source>${maven.compiler.source}</source>
                  <target>${maven.compiler.target}</target>
diff --git a/examples/powertools-examples-idempotency/pom.xml b/examples/powertools-examples-idempotency/pom.xml
index fa577d223..0f1139534 100644
--- a/examples/powertools-examples-idempotency/pom.xml
+++ b/examples/powertools-examples-idempotency/pom.xml
@@ -76,9 +76,9 @@
     <build>
       <plugins>
         <plugin>
-             <groupId>org.codehaus.mojo</groupId>
+             <groupId>dev.aspectj</groupId>
              <artifactId>aspectj-maven-plugin</artifactId>
-             <version>1.14.0</version>
+             <version>1.13.1</version>
              <configuration>
                  <source>${maven.compiler.source}</source>
                  <target>${maven.compiler.target}</target>
diff --git a/examples/powertools-examples-parameters/pom.xml b/examples/powertools-examples-parameters/pom.xml
index b588979cd..02e667425 100644
--- a/examples/powertools-examples-parameters/pom.xml
+++ b/examples/powertools-examples-parameters/pom.xml
@@ -63,9 +63,9 @@
               <version>3.1.0</version>
           </plugin>
         <plugin>
-             <groupId>org.codehaus.mojo</groupId>
+             <groupId>dev.aspectj</groupId>
              <artifactId>aspectj-maven-plugin</artifactId>
-             <version>1.14.0</version>
+             <version>1.13.1</version>
              <configuration>
                  <source>${maven.compiler.source}</source>
                  <target>${maven.compiler.target}</target>
diff --git a/examples/powertools-examples-sqs/pom.xml b/examples/powertools-examples-sqs/pom.xml
index 608269504..e0569a8d1 100644
--- a/examples/powertools-examples-sqs/pom.xml
+++ b/examples/powertools-examples-sqs/pom.xml
@@ -64,9 +64,9 @@
     <build>
       <plugins>
         <plugin>
-             <groupId>org.codehaus.mojo</groupId>
+             <groupId>dev.aspectj</groupId>
              <artifactId>aspectj-maven-plugin</artifactId>
-             <version>1.14.0</version>
+             <version>1.13.1</version>
              <configuration>
                  <source>${maven.compiler.source}</source>
                  <target>${maven.compiler.target}</target>
diff --git a/examples/powertools-examples-validation/pom.xml b/examples/powertools-examples-validation/pom.xml
index e97ce7b56..a427a10d8 100644
--- a/examples/powertools-examples-validation/pom.xml
+++ b/examples/powertools-examples-validation/pom.xml
@@ -58,9 +58,9 @@
               <version>3.1.0</version>
           </plugin>
         <plugin>
-             <groupId>org.codehaus.mojo</groupId>
+             <groupId>dev.aspectj</groupId>
              <artifactId>aspectj-maven-plugin</artifactId>
-             <version>1.14.0</version>
+             <version>1.13.1</version>
              <configuration>
                  <source>${maven.compiler.source}</source>
                  <target>${maven.compiler.target}</target>
diff --git a/pom.xml b/pom.xml
index 0d096141e..2bb28f2ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
         <lambda.events.version>3.11.1</lambda.events.version>
         <lambda.serial.version>1.1.2</lambda.serial.version>
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-        <aspectj-maven-plugin.version>1.14.0</aspectj-maven-plugin.version>
+        <aspectj-maven-plugin.version>1.13.1</aspectj-maven-plugin.version>
         <maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
         <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
@@ -307,7 +307,7 @@
                     <version>${maven-compiler-plugin.version}</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
+                    <groupId>dev.aspectj</groupId>
                     <artifactId>aspectj-maven-plugin</artifactId>
                     <version>${aspectj-maven-plugin.version}</version>
                 </plugin>
@@ -354,7 +354,7 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
                 <version>${aspectj-maven-plugin.version}</version>
                 <configuration>
diff --git a/powertools-e2e-tests/handlers/idempotency/pom.xml b/powertools-e2e-tests/handlers/idempotency/pom.xml
index ae7ca0807..4e24c738c 100644
--- a/powertools-e2e-tests/handlers/idempotency/pom.xml
+++ b/powertools-e2e-tests/handlers/idempotency/pom.xml
@@ -27,7 +27,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
                 <configuration>
                     <source>${maven.compiler.source}</source>
diff --git a/powertools-e2e-tests/handlers/logging/pom.xml b/powertools-e2e-tests/handlers/logging/pom.xml
index c47cc6d37..4b613f2bf 100644
--- a/powertools-e2e-tests/handlers/logging/pom.xml
+++ b/powertools-e2e-tests/handlers/logging/pom.xml
@@ -27,7 +27,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
                 <configuration>
                     <source>${maven.compiler.source}</source>
diff --git a/powertools-e2e-tests/handlers/metrics/pom.xml b/powertools-e2e-tests/handlers/metrics/pom.xml
index e591f4966..723ad75c5 100644
--- a/powertools-e2e-tests/handlers/metrics/pom.xml
+++ b/powertools-e2e-tests/handlers/metrics/pom.xml
@@ -27,7 +27,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
                 <configuration>
                     <source>${maven.compiler.source}</source>
diff --git a/powertools-e2e-tests/handlers/pom.xml b/powertools-e2e-tests/handlers/pom.xml
index 5cf30d5d5..78669e484 100644
--- a/powertools-e2e-tests/handlers/pom.xml
+++ b/powertools-e2e-tests/handlers/pom.xml
@@ -18,7 +18,7 @@
         <lambda.java.core>1.2.2</lambda.java.core>
         <lambda.java.events>3.11.0</lambda.java.events>
         <maven.shade.version>3.2.4</maven.shade.version>
-        <aspectj.version>1.14.0</aspectj.version>
+        <aspectj.version>1.13.1</aspectj.version>
         <maven.compiler.version>3.10.1</maven.compiler.version>
     </properties>
 
@@ -99,7 +99,7 @@
                     </dependencies>
                 </plugin>
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
+                    <groupId>dev.aspectj</groupId>
                     <artifactId>aspectj-maven-plugin</artifactId>
                     <version>${aspectj.version}</version>
                 </plugin>
diff --git a/powertools-e2e-tests/handlers/tracing/pom.xml b/powertools-e2e-tests/handlers/tracing/pom.xml
index 831669a3d..252009aa9 100644
--- a/powertools-e2e-tests/handlers/tracing/pom.xml
+++ b/powertools-e2e-tests/handlers/tracing/pom.xml
@@ -27,7 +27,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
                 <configuration>
                     <source>${maven.compiler.source}</source>
diff --git a/powertools-serialization/pom.xml b/powertools-serialization/pom.xml
index 32eb53383..e68b26f7b 100644
--- a/powertools-serialization/pom.xml
+++ b/powertools-serialization/pom.xml
@@ -75,7 +75,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
                 <version>${aspectj-maven-plugin.version}</version>
                 <configuration>
diff --git a/powertools-test-suite/pom.xml b/powertools-test-suite/pom.xml
index 24dfd646f..2cd323f41 100644
--- a/powertools-test-suite/pom.xml
+++ b/powertools-test-suite/pom.xml
@@ -115,9 +115,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.14.0</version>
+                <version>1.13.1</version>
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>

From d0d392146be52d40fe164b0deae0d4a328e83ca5 Mon Sep 17 00:00:00 2001
From: Michele Ricciardi <mriccia@amazon.com>
Date: Fri, 2 Jun 2023 12:30:29 +0200
Subject: [PATCH 2/4] chore: add `aspectjrt` to docs for java17+ compatibility

---
 docs/index.md                                | 1 +
 docs/utilities/batch.md                      | 1 +
 docs/utilities/parameters.md                 | 2 ++
 docs/utilities/sqs_large_message_handling.md | 1 +
 docs/utilities/validation.md                 | 1 +
 5 files changed, 6 insertions(+)

diff --git a/docs/index.md b/docs/index.md
index 9c3f73233..810f3821b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -122,6 +122,7 @@ For more information about the project and available options refer to this [repo
         aspect 'software.amazon.lambda:powertools-logging:{{ powertools.version }}'
         aspect 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}'
         aspect 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}'
+        implementation 'org.aspectj:aspectjrt:1.9.19'
     }
 
     sourceCompatibility = 11
diff --git a/docs/utilities/batch.md b/docs/utilities/batch.md
index acedf4f91..a479eae2b 100644
--- a/docs/utilities/batch.md
+++ b/docs/utilities/batch.md
@@ -83,6 +83,7 @@ To install this utility, add the following dependency to your project.
     dependencies {
         ...
         aspect 'software.amazon.lambda:powertools-sqs:{{ powertools.version }}'
+        implementation 'org.aspectj:aspectjrt:1.9.19'
     }
     ```
 
diff --git a/docs/utilities/parameters.md b/docs/utilities/parameters.md
index 96fb41d04..f980b733b 100644
--- a/docs/utilities/parameters.md
+++ b/docs/utilities/parameters.md
@@ -34,6 +34,7 @@ To install this utility, add the following dependency to your project.
      dependencies {
         ...
         aspect 'software.amazon.lambda:powertools-parameters:{{ powertools.version }}'
+        implementation 'org.aspectj:aspectjrt:1.9.19'
     }
     ```
 
@@ -482,5 +483,6 @@ If you want to use the ```@Param``` annotation in your project add configuration
     dependencies {
         ...
         aspect 'software.amazon.lambda:powertools-parameters:{{ powertools.version }}'
+        implementation 'org.aspectj:aspectjrt:1.9.19'
     }
     ```
\ No newline at end of file
diff --git a/docs/utilities/sqs_large_message_handling.md b/docs/utilities/sqs_large_message_handling.md
index 5e100188b..f803ea2cd 100644
--- a/docs/utilities/sqs_large_message_handling.md
+++ b/docs/utilities/sqs_large_message_handling.md
@@ -91,6 +91,7 @@ To install this utility, add the following dependency to your project.
     dependencies {
         ...
         aspect 'software.amazon.lambda:powertools-sqs:{{ powertools.version }}'
+        implementation 'org.aspectj:aspectjrt:1.9.19'
     }
     ```
 
diff --git a/docs/utilities/validation.md b/docs/utilities/validation.md
index 0d8f26c4e..fe846ee89 100644
--- a/docs/utilities/validation.md
+++ b/docs/utilities/validation.md
@@ -72,6 +72,7 @@ To install this utility, add the following dependency to your project.
 
     dependencies {
         aspect 'software.amazon.lambda:powertools-validation:{{ powertools.version }}'
+        implementation 'org.aspectj:aspectjrt:1.9.19'
     }
     ```
 

From 2cea33dcee8587dce0792901f950f01e68cab635 Mon Sep 17 00:00:00 2001
From: Michele Ricciardi <mriccia@amazon.com>
Date: Fri, 2 Jun 2023 14:11:35 +0200
Subject: [PATCH 3/4] chore: add comment for gradle import (only required for
 Java17+)

---
 docs/utilities/batch.md                      | 3 ++-
 docs/utilities/parameters.md                 | 3 ++-
 docs/utilities/sqs_large_message_handling.md | 3 ++-
 docs/utilities/validation.md                 | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/utilities/batch.md b/docs/utilities/batch.md
index a479eae2b..0a2add081 100644
--- a/docs/utilities/batch.md
+++ b/docs/utilities/batch.md
@@ -83,7 +83,8 @@ To install this utility, add the following dependency to your project.
     dependencies {
         ...
         aspect 'software.amazon.lambda:powertools-sqs:{{ powertools.version }}'
-        implementation 'org.aspectj:aspectjrt:1.9.19'
+//      This dependency is needed for Java17+, please uncomment it if you are using Java17+
+//      implementation 'org.aspectj:aspectjrt:1.9.19'
     }
     ```
 
diff --git a/docs/utilities/parameters.md b/docs/utilities/parameters.md
index f980b733b..9041ac08e 100644
--- a/docs/utilities/parameters.md
+++ b/docs/utilities/parameters.md
@@ -34,7 +34,8 @@ To install this utility, add the following dependency to your project.
      dependencies {
         ...
         aspect 'software.amazon.lambda:powertools-parameters:{{ powertools.version }}'
-        implementation 'org.aspectj:aspectjrt:1.9.19'
+//      This dependency is needed for Java17+, please uncomment it if you are using Java17+
+//      implementation 'org.aspectj:aspectjrt:1.9.19'
     }
     ```
 
diff --git a/docs/utilities/sqs_large_message_handling.md b/docs/utilities/sqs_large_message_handling.md
index f803ea2cd..5f7ede095 100644
--- a/docs/utilities/sqs_large_message_handling.md
+++ b/docs/utilities/sqs_large_message_handling.md
@@ -91,7 +91,8 @@ To install this utility, add the following dependency to your project.
     dependencies {
         ...
         aspect 'software.amazon.lambda:powertools-sqs:{{ powertools.version }}'
-        implementation 'org.aspectj:aspectjrt:1.9.19'
+//      This dependency is needed for Java17+, please uncomment it if you are using Java17+
+//      implementation 'org.aspectj:aspectjrt:1.9.19'
     }
     ```
 
diff --git a/docs/utilities/validation.md b/docs/utilities/validation.md
index fe846ee89..8733c0e77 100644
--- a/docs/utilities/validation.md
+++ b/docs/utilities/validation.md
@@ -72,7 +72,8 @@ To install this utility, add the following dependency to your project.
 
     dependencies {
         aspect 'software.amazon.lambda:powertools-validation:{{ powertools.version }}'
-        implementation 'org.aspectj:aspectjrt:1.9.19'
+//      This dependency is needed for Java17+, please uncomment it if you are using Java17+
+//      implementation 'org.aspectj:aspectjrt:1.9.19'
     }
     ```
 

From 622f98a89933ac3d0ad6bd8cce3c86298bfe3a98 Mon Sep 17 00:00:00 2001
From: Michele Ricciardi <mriccia@amazon.com>
Date: Fri, 2 Jun 2023 14:11:48 +0200
Subject: [PATCH 4/4] chore: add comment for gradle import (only required for
 Java17+)

---
 docs/index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 810f3821b..10726f0ab 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -122,7 +122,8 @@ For more information about the project and available options refer to this [repo
         aspect 'software.amazon.lambda:powertools-logging:{{ powertools.version }}'
         aspect 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}'
         aspect 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}'
-        implementation 'org.aspectj:aspectjrt:1.9.19'
+//      This dependency is needed for Java17+, please uncomment it if you are using Java17+
+//      implementation 'org.aspectj:aspectjrt:1.9.19'
     }
 
     sourceCompatibility = 11