From 38f881475a69df9fd099e125217b2f7e8939aada Mon Sep 17 00:00:00 2001
From: Scott Gerring <scott.gerring@spookfish.com>
Date: Sun, 25 Jun 2023 09:55:15 +0200
Subject: [PATCH 01/17] First break the build

---
 examples/pom.xml                                   | 6 ------
 examples/powertools-examples-core/pom.xml          | 6 ------
 examples/powertools-examples-idempotency/pom.xml   | 6 ------
 examples/powertools-examples-parameters/pom.xml    | 6 ------
 examples/powertools-examples-serialization/pom.xml | 6 ------
 examples/powertools-examples-sqs/pom.xml           | 6 ------
 examples/powertools-examples-validation/pom.xml    | 6 ------
 7 files changed, 42 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 95de07209..66d26bdc3 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -7,12 +7,6 @@
     <artifactId>powertools-examples</artifactId>
     <packaging>pom</packaging>
 
-    <parent>
-        <artifactId>powertools-parent</artifactId>
-        <groupId>software.amazon.lambda</groupId>
-        <version>1.15.0</version>
-    </parent>
-
     <name>Powertools for AWS Lambda (Java) library Examples</name>
     <description>
         A suite of examples accompanying for Powertools for AWS Lambda (Java).
diff --git a/examples/powertools-examples-core/pom.xml b/examples/powertools-examples-core/pom.xml
index e6ccd3918..ba5ebe782 100644
--- a/examples/powertools-examples-core/pom.xml
+++ b/examples/powertools-examples-core/pom.xml
@@ -4,12 +4,6 @@
     <artifactId>powertools-examples-core</artifactId>
     <packaging>jar</packaging>
     <name>Powertools for AWS Lambda (Java) library Examples - Core</name>
-    
-    <parent>
-        <artifactId>powertools-examples</artifactId>
-        <groupId>software.amazon.lambda</groupId>
-        <version>1.15.0</version>
-    </parent>
 
     <dependencies>
         <dependency>
diff --git a/examples/powertools-examples-idempotency/pom.xml b/examples/powertools-examples-idempotency/pom.xml
index c872ee905..c474c739c 100644
--- a/examples/powertools-examples-idempotency/pom.xml
+++ b/examples/powertools-examples-idempotency/pom.xml
@@ -5,12 +5,6 @@
     <packaging>jar</packaging>
     <name>Powertools for AWS Lambda (Java) library Examples - Idempotency</name>
 
-    <parent>
-        <artifactId>powertools-examples</artifactId>
-        <groupId>software.amazon.lambda</groupId>
-        <version>1.15.0</version>
-    </parent>
-
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
diff --git a/examples/powertools-examples-parameters/pom.xml b/examples/powertools-examples-parameters/pom.xml
index ac7d2176c..d0392278b 100644
--- a/examples/powertools-examples-parameters/pom.xml
+++ b/examples/powertools-examples-parameters/pom.xml
@@ -5,12 +5,6 @@
     <packaging>jar</packaging>
     <name>Powertools for AWS Lambda (Java) library Examples - Parameters</name>
 
-    <parent>
-        <artifactId>powertools-examples</artifactId>
-        <groupId>software.amazon.lambda</groupId>
-        <version>1.15.0</version>
-    </parent>
-
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
diff --git a/examples/powertools-examples-serialization/pom.xml b/examples/powertools-examples-serialization/pom.xml
index b3c7d70f7..f0e931ac3 100644
--- a/examples/powertools-examples-serialization/pom.xml
+++ b/examples/powertools-examples-serialization/pom.xml
@@ -5,12 +5,6 @@
     <packaging>jar</packaging>
     <name>Powertools for AWS Lambda (Java) library Examples - Serialization</name>
 
-    <parent>
-        <artifactId>powertools-examples</artifactId>
-        <groupId>software.amazon.lambda</groupId>
-        <version>1.15.0</version>
-    </parent>
-
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
diff --git a/examples/powertools-examples-sqs/pom.xml b/examples/powertools-examples-sqs/pom.xml
index a4a45b878..cdebd4b16 100644
--- a/examples/powertools-examples-sqs/pom.xml
+++ b/examples/powertools-examples-sqs/pom.xml
@@ -5,12 +5,6 @@
     <packaging>jar</packaging>
     <name>Powertools for AWS Lambda (Java) library Examples - SQS</name>
 
-    <parent>
-        <artifactId>powertools-examples</artifactId>
-        <groupId>software.amazon.lambda</groupId>
-        <version>1.15.0</version>
-    </parent>
-
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
diff --git a/examples/powertools-examples-validation/pom.xml b/examples/powertools-examples-validation/pom.xml
index f63a54b57..5008e00ad 100644
--- a/examples/powertools-examples-validation/pom.xml
+++ b/examples/powertools-examples-validation/pom.xml
@@ -5,12 +5,6 @@
     <packaging>jar</packaging>
     <name>Powertools for AWS Lambda (Java) library Examples - Validation</name>
 
-    <parent>
-        <artifactId>powertools-examples</artifactId>
-        <groupId>software.amazon.lambda</groupId>
-        <version>1.15.0</version>
-    </parent>
-
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>

From 3c609b0c8b5c39c1c210db46b4cbc7899e222203 Mon Sep 17 00:00:00 2001
From: Scott Gerring <scott.gerring@spookfish.com>
Date: Sun, 25 Jun 2023 10:57:47 +0200
Subject: [PATCH 02/17] Start to fill in missing params

---
 examples/pom.xml                                   | 2 ++
 examples/powertools-examples-core/pom.xml          | 8 ++++++++
 examples/powertools-examples-idempotency/pom.xml   | 7 +++++++
 examples/powertools-examples-parameters/pom.xml    | 3 +++
 examples/powertools-examples-serialization/pom.xml | 3 +++
 examples/powertools-examples-sqs/pom.xml           | 6 ++++++
 examples/powertools-examples-validation/pom.xml    | 3 +++
 7 files changed, 32 insertions(+)

diff --git a/examples/pom.xml b/examples/pom.xml
index 66d26bdc3..5311d5e0b 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -4,7 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>software.amazon.lambda</groupId>
     <artifactId>powertools-examples</artifactId>
+    <version>1.15.0</version>
     <packaging>pom</packaging>
 
     <name>Powertools for AWS Lambda (Java) library Examples</name>
diff --git a/examples/powertools-examples-core/pom.xml b/examples/powertools-examples-core/pom.xml
index ba5ebe782..86f3d4a74 100644
--- a/examples/powertools-examples-core/pom.xml
+++ b/examples/powertools-examples-core/pom.xml
@@ -1,10 +1,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
+    <groupId>software.amazon.lambda.examples</groupId>
+    <version>1.15.0</version>
     <artifactId>powertools-examples-core</artifactId>
     <packaging>jar</packaging>
+    
     <name>Powertools for AWS Lambda (Java) library Examples - Core</name>
 
+    <properties>
+        <log4j.version>2.20.0</log4j.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
diff --git a/examples/powertools-examples-idempotency/pom.xml b/examples/powertools-examples-idempotency/pom.xml
index c474c739c..d55894e40 100644
--- a/examples/powertools-examples-idempotency/pom.xml
+++ b/examples/powertools-examples-idempotency/pom.xml
@@ -1,10 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    
+    <groupId>software.amazon.lambda.examples</groupId>
+    <version>1.15.0</version>
     <artifactId>powertools-examples-idempotency</artifactId>
     <packaging>jar</packaging>
     <name>Powertools for AWS Lambda (Java) library Examples - Idempotency</name>
 
+    <properties>
+        <log4j.version>2.20.0</log4j.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
diff --git a/examples/powertools-examples-parameters/pom.xml b/examples/powertools-examples-parameters/pom.xml
index d0392278b..de0708751 100644
--- a/examples/powertools-examples-parameters/pom.xml
+++ b/examples/powertools-examples-parameters/pom.xml
@@ -1,8 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>software.amazon.lambda.examples</groupId>
+    <version>1.15.0</version>
     <artifactId>powertools-examples-parameters</artifactId>
     <packaging>jar</packaging>
+    
     <name>Powertools for AWS Lambda (Java) library Examples - Parameters</name>
 
     <dependencies>
diff --git a/examples/powertools-examples-serialization/pom.xml b/examples/powertools-examples-serialization/pom.xml
index f0e931ac3..169d52869 100644
--- a/examples/powertools-examples-serialization/pom.xml
+++ b/examples/powertools-examples-serialization/pom.xml
@@ -1,8 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>software.amazon.lambda.examples</groupId>
+    <version>1.15.0</version>
     <artifactId>powertools-examples-serialization</artifactId>
     <packaging>jar</packaging>
+    
     <name>Powertools for AWS Lambda (Java) library Examples - Serialization</name>
 
     <dependencies>
diff --git a/examples/powertools-examples-sqs/pom.xml b/examples/powertools-examples-sqs/pom.xml
index cdebd4b16..9ec8900e9 100644
--- a/examples/powertools-examples-sqs/pom.xml
+++ b/examples/powertools-examples-sqs/pom.xml
@@ -1,10 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>software.amazon.lambda.examples</groupId>
+    <version>1.15.0</version>
     <artifactId>powertools-examples-sqs</artifactId>
     <packaging>jar</packaging>
     <name>Powertools for AWS Lambda (Java) library Examples - SQS</name>
 
+    <properties>
+        <log4j.version>2.20.0</log4j.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
diff --git a/examples/powertools-examples-validation/pom.xml b/examples/powertools-examples-validation/pom.xml
index 5008e00ad..d77a1ed79 100644
--- a/examples/powertools-examples-validation/pom.xml
+++ b/examples/powertools-examples-validation/pom.xml
@@ -1,8 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>software.amazon.lambda.examples</groupId>
+    <version>1.15.0</version>
     <artifactId>powertools-examples-validation</artifactId>
     <packaging>jar</packaging>
+    
     <name>Powertools for AWS Lambda (Java) library Examples - Validation</name>
 
     <dependencies>

From 8a1b2b9ccb7990baaf98dbca587202a0b8dafd00 Mon Sep 17 00:00:00 2001
From: Scott Gerring <scott.gerring@spookfish.com>
Date: Sun, 25 Jun 2023 13:58:52 +0200
Subject: [PATCH 03/17] Fix build

---
 examples/powertools-examples-core/pom.xml          | 2 ++
 examples/powertools-examples-idempotency/pom.xml   | 2 ++
 examples/powertools-examples-parameters/pom.xml    | 6 +++++-
 examples/powertools-examples-serialization/pom.xml | 6 +++++-
 examples/powertools-examples-sqs/pom.xml           | 2 ++
 examples/powertools-examples-validation/pom.xml    | 6 +++++-
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/examples/powertools-examples-core/pom.xml b/examples/powertools-examples-core/pom.xml
index 86f3d4a74..85ca3424b 100644
--- a/examples/powertools-examples-core/pom.xml
+++ b/examples/powertools-examples-core/pom.xml
@@ -11,6 +11,8 @@
 
     <properties>
         <log4j.version>2.20.0</log4j.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>        
     </properties>
 
     <dependencies>
diff --git a/examples/powertools-examples-idempotency/pom.xml b/examples/powertools-examples-idempotency/pom.xml
index d55894e40..5561eb13a 100644
--- a/examples/powertools-examples-idempotency/pom.xml
+++ b/examples/powertools-examples-idempotency/pom.xml
@@ -10,6 +10,8 @@
 
     <properties>
         <log4j.version>2.20.0</log4j.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>        
     </properties>
 
     <dependencies>
diff --git a/examples/powertools-examples-parameters/pom.xml b/examples/powertools-examples-parameters/pom.xml
index de0708751..699474ab4 100644
--- a/examples/powertools-examples-parameters/pom.xml
+++ b/examples/powertools-examples-parameters/pom.xml
@@ -5,9 +5,13 @@
     <version>1.15.0</version>
     <artifactId>powertools-examples-parameters</artifactId>
     <packaging>jar</packaging>
-    
     <name>Powertools for AWS Lambda (Java) library Examples - Parameters</name>
 
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+    
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
diff --git a/examples/powertools-examples-serialization/pom.xml b/examples/powertools-examples-serialization/pom.xml
index 169d52869..222c6d0d9 100644
--- a/examples/powertools-examples-serialization/pom.xml
+++ b/examples/powertools-examples-serialization/pom.xml
@@ -5,9 +5,13 @@
     <version>1.15.0</version>
     <artifactId>powertools-examples-serialization</artifactId>
     <packaging>jar</packaging>
-    
     <name>Powertools for AWS Lambda (Java) library Examples - Serialization</name>
 
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
diff --git a/examples/powertools-examples-sqs/pom.xml b/examples/powertools-examples-sqs/pom.xml
index 9ec8900e9..f543e262d 100644
--- a/examples/powertools-examples-sqs/pom.xml
+++ b/examples/powertools-examples-sqs/pom.xml
@@ -9,6 +9,8 @@
 
     <properties>
         <log4j.version>2.20.0</log4j.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>        
     </properties>
 
     <dependencies>
diff --git a/examples/powertools-examples-validation/pom.xml b/examples/powertools-examples-validation/pom.xml
index d77a1ed79..8acb2059f 100644
--- a/examples/powertools-examples-validation/pom.xml
+++ b/examples/powertools-examples-validation/pom.xml
@@ -5,9 +5,13 @@
     <version>1.15.0</version>
     <artifactId>powertools-examples-validation</artifactId>
     <packaging>jar</packaging>
-    
     <name>Powertools for AWS Lambda (Java) library Examples - Validation</name>
 
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>

From 7091c4cf3beaeef46fcf5183d589a5d7188c91f9 Mon Sep 17 00:00:00 2001
From: Scott Gerring <scott.gerring@spookfish.com>
Date: Sun, 25 Jun 2023 14:11:33 +0200
Subject: [PATCH 04/17] Force plugin versions?

---
 examples/pom.xml                          | 28 -----------------------
 examples/powertools-examples-core/pom.xml |  6 ++++-
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 5311d5e0b..ab61cf716 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,32 +28,4 @@
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin> <!-- skip coverage for examples -->
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file
diff --git a/examples/powertools-examples-core/pom.xml b/examples/powertools-examples-core/pom.xml
index 85ca3424b..fcd848622 100644
--- a/examples/powertools-examples-core/pom.xml
+++ b/examples/powertools-examples-core/pom.xml
@@ -12,7 +12,11 @@
     <properties>
         <log4j.version>2.20.0</log4j.version>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>        
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <aspectj-maven-plugin.version>1.13.1</aspectj-maven-plugin.version>
+        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+        <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
     </properties>
 
     <dependencies>

From aa96b54f7aa25ecee7421b1b3fe28786d96a1ab9 Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 06:31:28 +0200
Subject: [PATCH 05/17] Force JDK-specific aspectj versions - test in params
 example

---
 .../powertools-examples-parameters/pom.xml    | 88 +++++++++++++++++++
 .../powertools/batch/BatchMessageHandler.java | 25 ++++++
 .../examples/ExampleMessageHandler2.java      |  2 +
 3 files changed, 115 insertions(+)
 create mode 100644 powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/BatchMessageHandler.java
 create mode 100644 powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/examples/ExampleMessageHandler2.java

diff --git a/examples/powertools-examples-parameters/pom.xml b/examples/powertools-examples-parameters/pom.xml
index 699474ab4..11eedf764 100644
--- a/examples/powertools-examples-parameters/pom.xml
+++ b/examples/powertools-examples-parameters/pom.xml
@@ -88,4 +88,92 @@
         </plugin>
       </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>(,11)</jdk> <!-- < 11 -->
+            </activation>
+            <properties>
+                <aspectj.version>1.9.7</aspectj.version>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>dev.aspectj</groupId>
+                            <artifactId>aspectj-maven-plugin</artifactId>
+                            <version>${aspectj.plugin.version}</version>
+                            <configuration>
+                                <source>${maven.compiler.source}</source>
+                                <target>${maven.compiler.target}</target>
+                                <complianceLevel>${maven.compiler.target}</complianceLevel>
+                                <Xlint>ignore</Xlint>
+                                <encoding>UTF-8</encoding>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <phase>process-sources</phase>
+                                    <goals>
+                                        <goal>compile</goal>
+                                        <goal>test-compile</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                            <!-- Enforce aspectJ 1.9.7 -->
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.aspectj</groupId>
+                                    <artifactId>aspectjtools</artifactId>
+                                    <version>${aspectj.version}</version>
+                                </dependency>
+                            </dependencies>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+        <profile>
+            <id>jdk11plus</id>
+            <activation>
+                <jdk>[11,)</jdk> <!-- >= 11 -->
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>dev.aspectj</groupId>
+                            <artifactId>aspectj-maven-plugin</artifactId>
+                            <version>${aspectj.plugin.version}</version>
+                            <configuration>
+                                <source>${maven.compiler.source}</source>
+                                <target>${maven.compiler.target}</target>
+                                <complianceLevel>${maven.compiler.target}</complianceLevel>
+                                <Xlint>ignore</Xlint>
+                                <encoding>UTF-8</encoding>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <phase>process-sources</phase>
+                                    <goals>
+                                        <goal>compile</goal>
+                                        <goal>test-compile</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/BatchMessageHandler.java b/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/BatchMessageHandler.java
new file mode 100644
index 000000000..6a3427f30
--- /dev/null
+++ b/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/BatchMessageHandler.java
@@ -0,0 +1,25 @@
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.amazonaws.services.lambda.runtime.events.SQSEvent;
+import software.amazon.lambda.powertools.batch.BatchMessageHandlerBuilder;
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+
+import java.util.List;
+
+/**
+ *
+ * @param <T>
+ */
+public abstract class BatchMessageHandler<T, U> implements RequestHandler<T, List<String>> {
+
+
+    public BatchMessageHandler() {
+    }
+
+    @Override
+    public List<String> handleRequest(T t, Context context) {
+        throw new NotImplementedException();
+    }
+
+    public abstract U processMessage(T message);
+}
diff --git a/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/examples/ExampleMessageHandler2.java b/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/examples/ExampleMessageHandler2.java
new file mode 100644
index 000000000..21418bb9c
--- /dev/null
+++ b/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/examples/ExampleMessageHandler2.java
@@ -0,0 +1,2 @@
+package software.amazon.lambda.powertools.batch.examples;public class ExampleMessageHandler2 {
+}

From e141a5bd32f246fa07d4509bf74a5deb45aebb7d Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 06:54:14 +0200
Subject: [PATCH 06/17] Temporarily restrict examples build to params only

---
 examples/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index ab61cf716..b3cdbb687 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -15,12 +15,7 @@
     </description>
 
     <modules>
-        <module>powertools-examples-core</module>
-        <module>powertools-examples-idempotency</module>
         <module>powertools-examples-parameters</module>
-        <module>powertools-examples-serialization</module>
-        <module>powertools-examples-sqs</module>
-        <module>powertools-examples-validation</module>
     </modules>
 
     <!-- Don't deploy the examples -->

From d258158d30862ae2c8168410e1d349de4067d734 Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 07:00:44 +0200
Subject: [PATCH 07/17] Do we need the 11+ profile?

---
 .../powertools-examples-parameters/pom.xml    | 35 +------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/examples/powertools-examples-parameters/pom.xml b/examples/powertools-examples-parameters/pom.xml
index 11eedf764..994bf125c 100644
--- a/examples/powertools-examples-parameters/pom.xml
+++ b/examples/powertools-examples-parameters/pom.xml
@@ -92,7 +92,7 @@
         <profile>
             <id>jdk8</id>
             <activation>
-                <jdk>(,11)</jdk> <!-- < 11 -->
+                <jdk>(,11)</jdk> <!-- 8 -->
             </activation>
             <properties>
                 <aspectj.version>1.9.7</aspectj.version>
@@ -142,38 +142,5 @@
                 </pluginManagement>
             </build>
         </profile>
-        <profile>
-            <id>jdk11plus</id>
-            <activation>
-                <jdk>[11,)</jdk> <!-- >= 11 -->
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>dev.aspectj</groupId>
-                            <artifactId>aspectj-maven-plugin</artifactId>
-                            <version>${aspectj.plugin.version}</version>
-                            <configuration>
-                                <source>${maven.compiler.source}</source>
-                                <target>${maven.compiler.target}</target>
-                                <complianceLevel>${maven.compiler.target}</complianceLevel>
-                                <Xlint>ignore</Xlint>
-                                <encoding>UTF-8</encoding>
-                            </configuration>
-                            <executions>
-                                <execution>
-                                    <phase>process-sources</phase>
-                                    <goals>
-                                        <goal>compile</goal>
-                                        <goal>test-compile</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
     </profiles>
 </project>

From e9b45c2c6646552be7607c8eb25891fc44359c67 Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 07:06:08 +0200
Subject: [PATCH 08/17] Add profile to remaining examples

---
 examples/pom.xml                              |  5 ++
 examples/powertools-examples-core/pom.xml     | 58 ++++++++++++++++++
 .../powertools-examples-idempotency/pom.xml   | 58 ++++++++++++++++++
 .../powertools-examples-parameters/pom.xml    |  3 +
 .../powertools-examples-serialization/pom.xml | 59 +++++++++++++++++++
 examples/powertools-examples-sqs/pom.xml      | 58 ++++++++++++++++++
 .../powertools-examples-validation/pom.xml    | 58 ++++++++++++++++++
 7 files changed, 299 insertions(+)

diff --git a/examples/pom.xml b/examples/pom.xml
index b3cdbb687..ab61cf716 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -15,7 +15,12 @@
     </description>
 
     <modules>
+        <module>powertools-examples-core</module>
+        <module>powertools-examples-idempotency</module>
         <module>powertools-examples-parameters</module>
+        <module>powertools-examples-serialization</module>
+        <module>powertools-examples-sqs</module>
+        <module>powertools-examples-validation</module>
     </modules>
 
     <!-- Don't deploy the examples -->
diff --git a/examples/powertools-examples-core/pom.xml b/examples/powertools-examples-core/pom.xml
index fcd848622..5d2648837 100644
--- a/examples/powertools-examples-core/pom.xml
+++ b/examples/powertools-examples-core/pom.xml
@@ -126,4 +126,62 @@
         </plugin>
       </plugins>
     </build>
+    <profiles>
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+             version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
+              on the project. -->
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>(,11)</jdk> <!-- 8 -->
+            </activation>
+            <properties>
+                <aspectj.version>1.9.7</aspectj.version>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>dev.aspectj</groupId>
+                            <artifactId>aspectj-maven-plugin</artifactId>
+                            <version>${aspectj.plugin.version}</version>
+                            <configuration>
+                                <source>${maven.compiler.source}</source>
+                                <target>${maven.compiler.target}</target>
+                                <complianceLevel>${maven.compiler.target}</complianceLevel>
+                                <Xlint>ignore</Xlint>
+                                <encoding>UTF-8</encoding>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <phase>process-sources</phase>
+                                    <goals>
+                                        <goal>compile</goal>
+                                        <goal>test-compile</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                            <!-- Enforce aspectJ 1.9.7 -->
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.aspectj</groupId>
+                                    <artifactId>aspectjtools</artifactId>
+                                    <version>${aspectj.version}</version>
+                                </dependency>
+                            </dependencies>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/examples/powertools-examples-idempotency/pom.xml b/examples/powertools-examples-idempotency/pom.xml
index 5561eb13a..cfb4f731b 100644
--- a/examples/powertools-examples-idempotency/pom.xml
+++ b/examples/powertools-examples-idempotency/pom.xml
@@ -171,6 +171,64 @@
         </plugin>
       </plugins>
     </build>
+    <profiles>
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+             version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
+              on the project. -->
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>(,11)</jdk> <!-- 8 -->
+            </activation>
+            <properties>
+                <aspectj.version>1.9.7</aspectj.version>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>dev.aspectj</groupId>
+                            <artifactId>aspectj-maven-plugin</artifactId>
+                            <version>${aspectj.plugin.version}</version>
+                            <configuration>
+                                <source>${maven.compiler.source}</source>
+                                <target>${maven.compiler.target}</target>
+                                <complianceLevel>${maven.compiler.target}</complianceLevel>
+                                <Xlint>ignore</Xlint>
+                                <encoding>UTF-8</encoding>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <phase>process-sources</phase>
+                                    <goals>
+                                        <goal>compile</goal>
+                                        <goal>test-compile</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                            <!-- Enforce aspectJ 1.9.7 -->
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.aspectj</groupId>
+                                    <artifactId>aspectjtools</artifactId>
+                                    <version>${aspectj.version}</version>
+                                </dependency>
+                            </dependencies>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
     <repositories>
         <repository>
             <id>dynamodb-local-oregon</id>
diff --git a/examples/powertools-examples-parameters/pom.xml b/examples/powertools-examples-parameters/pom.xml
index 994bf125c..365565168 100644
--- a/examples/powertools-examples-parameters/pom.xml
+++ b/examples/powertools-examples-parameters/pom.xml
@@ -89,6 +89,9 @@
       </plugins>
     </build>
     <profiles>
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+             version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
+              on the project. -->
         <profile>
             <id>jdk8</id>
             <activation>
diff --git a/examples/powertools-examples-serialization/pom.xml b/examples/powertools-examples-serialization/pom.xml
index 222c6d0d9..5dd6d94fd 100644
--- a/examples/powertools-examples-serialization/pom.xml
+++ b/examples/powertools-examples-serialization/pom.xml
@@ -65,4 +65,63 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+             version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
+              on the project. -->
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>(,11)</jdk> <!-- 8 -->
+            </activation>
+            <properties>
+                <aspectj.version>1.9.7</aspectj.version>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>dev.aspectj</groupId>
+                            <artifactId>aspectj-maven-plugin</artifactId>
+                            <version>${aspectj.plugin.version}</version>
+                            <configuration>
+                                <source>${maven.compiler.source}</source>
+                                <target>${maven.compiler.target}</target>
+                                <complianceLevel>${maven.compiler.target}</complianceLevel>
+                                <Xlint>ignore</Xlint>
+                                <encoding>UTF-8</encoding>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <phase>process-sources</phase>
+                                    <goals>
+                                        <goal>compile</goal>
+                                        <goal>test-compile</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                            <!-- Enforce aspectJ 1.9.7 -->
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.aspectj</groupId>
+                                    <artifactId>aspectjtools</artifactId>
+                                    <version>${aspectj.version}</version>
+                                </dependency>
+                            </dependencies>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/examples/powertools-examples-sqs/pom.xml b/examples/powertools-examples-sqs/pom.xml
index f543e262d..e29a91eda 100644
--- a/examples/powertools-examples-sqs/pom.xml
+++ b/examples/powertools-examples-sqs/pom.xml
@@ -121,4 +121,62 @@
         </plugin>
       </plugins>
     </build>
+    <profiles>
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+             version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
+              on the project. -->
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>(,11)</jdk> <!-- 8 -->
+            </activation>
+            <properties>
+                <aspectj.version>1.9.7</aspectj.version>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>dev.aspectj</groupId>
+                            <artifactId>aspectj-maven-plugin</artifactId>
+                            <version>${aspectj.plugin.version}</version>
+                            <configuration>
+                                <source>${maven.compiler.source}</source>
+                                <target>${maven.compiler.target}</target>
+                                <complianceLevel>${maven.compiler.target}</complianceLevel>
+                                <Xlint>ignore</Xlint>
+                                <encoding>UTF-8</encoding>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <phase>process-sources</phase>
+                                    <goals>
+                                        <goal>compile</goal>
+                                        <goal>test-compile</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                            <!-- Enforce aspectJ 1.9.7 -->
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.aspectj</groupId>
+                                    <artifactId>aspectjtools</artifactId>
+                                    <version>${aspectj.version}</version>
+                                </dependency>
+                            </dependencies>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/examples/powertools-examples-validation/pom.xml b/examples/powertools-examples-validation/pom.xml
index 8acb2059f..a117dbf6e 100644
--- a/examples/powertools-examples-validation/pom.xml
+++ b/examples/powertools-examples-validation/pom.xml
@@ -83,4 +83,62 @@
         </plugin>
       </plugins>
     </build>
+    <profiles>
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+             version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
+              on the project. -->
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>(,11)</jdk> <!-- 8 -->
+            </activation>
+            <properties>
+                <aspectj.version>1.9.7</aspectj.version>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>dev.aspectj</groupId>
+                            <artifactId>aspectj-maven-plugin</artifactId>
+                            <version>${aspectj.plugin.version}</version>
+                            <configuration>
+                                <source>${maven.compiler.source}</source>
+                                <target>${maven.compiler.target}</target>
+                                <complianceLevel>${maven.compiler.target}</complianceLevel>
+                                <Xlint>ignore</Xlint>
+                                <encoding>UTF-8</encoding>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <phase>process-sources</phase>
+                                    <goals>
+                                        <goal>compile</goal>
+                                        <goal>test-compile</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                            <!-- Enforce aspectJ 1.9.7 -->
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.aspectj</groupId>
+                                    <artifactId>aspectjtools</artifactId>
+                                    <version>${aspectj.version}</version>
+                                </dependency>
+                            </dependencies>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
 </project>

From 88025e5869e6c8b67dfc00637bf14bf32958382a Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 07:37:13 +0200
Subject: [PATCH 09/17] Add aspect library into profile for J8

---
 examples/powertools-examples-validation/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/examples/powertools-examples-validation/pom.xml b/examples/powertools-examples-validation/pom.xml
index a117dbf6e..2f0743fe9 100644
--- a/examples/powertools-examples-validation/pom.xml
+++ b/examples/powertools-examples-validation/pom.xml
@@ -117,6 +117,12 @@
                                 <complianceLevel>${maven.compiler.target}</complianceLevel>
                                 <Xlint>ignore</Xlint>
                                 <encoding>UTF-8</encoding>
+                                <aspectLibraries>
+                                    <aspectLibrary>
+                                        <groupId>software.amazon.lambda</groupId>
+                                        <artifactId>powertools-validation</artifactId>
+                                    </aspectLibrary>
+                                </aspectLibraries>
                             </configuration>
                             <executions>
                                 <execution>

From e6d9f7c0ce804ad8dab2798fea744df6b8438373 Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 07:45:54 +0200
Subject: [PATCH 10/17] Rejig pom some more

---
 examples/powertools-examples-validation/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/examples/powertools-examples-validation/pom.xml b/examples/powertools-examples-validation/pom.xml
index 2f0743fe9..161cde911 100644
--- a/examples/powertools-examples-validation/pom.xml
+++ b/examples/powertools-examples-validation/pom.xml
@@ -115,8 +115,6 @@
                                 <source>${maven.compiler.source}</source>
                                 <target>${maven.compiler.target}</target>
                                 <complianceLevel>${maven.compiler.target}</complianceLevel>
-                                <Xlint>ignore</Xlint>
-                                <encoding>UTF-8</encoding>
                                 <aspectLibraries>
                                     <aspectLibrary>
                                         <groupId>software.amazon.lambda</groupId>
@@ -126,7 +124,6 @@
                             </configuration>
                             <executions>
                                 <execution>
-                                    <phase>process-sources</phase>
                                     <goals>
                                         <goal>compile</goal>
                                         <goal>test-compile</goal>

From 407f83a827e32810c1372733ac72d2220fb23901 Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 08:04:30 +0200
Subject: [PATCH 11/17] Add aspect plugins to J1.8 profile

---
 examples/powertools-examples-core/pom.xml       | 16 +++++++++++++---
 .../powertools-examples-idempotency/pom.xml     | 17 ++++++++++++++---
 examples/powertools-examples-sqs/pom.xml        | 13 ++++++++++---
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/examples/powertools-examples-core/pom.xml b/examples/powertools-examples-core/pom.xml
index 5d2648837..5dc731d96 100644
--- a/examples/powertools-examples-core/pom.xml
+++ b/examples/powertools-examples-core/pom.xml
@@ -158,12 +158,22 @@
                                 <source>${maven.compiler.source}</source>
                                 <target>${maven.compiler.target}</target>
                                 <complianceLevel>${maven.compiler.target}</complianceLevel>
-                                <Xlint>ignore</Xlint>
-                                <encoding>UTF-8</encoding>
+                                <aspectLibraries>
+                                    <aspectLibrary>
+                                        <groupId>software.amazon.lambda</groupId>
+                                        <artifactId>powertools-tracing</artifactId>
+                                    </aspectLibrary>
+                                    <aspectLibrary>
+                                        <groupId>software.amazon.lambda</groupId>
+                                        <artifactId>powertools-logging</artifactId>
+                                    </aspectLibrary>
+                                    <aspectLibrary>
+                                        <groupId>software.amazon.lambda</groupId>
+                                        <artifactId>powertools-metrics</artifactId>
+                                    </aspectLibrary>                                </aspectLibraries>
                             </configuration>
                             <executions>
                                 <execution>
-                                    <phase>process-sources</phase>
                                     <goals>
                                         <goal>compile</goal>
                                         <goal>test-compile</goal>
diff --git a/examples/powertools-examples-idempotency/pom.xml b/examples/powertools-examples-idempotency/pom.xml
index cfb4f731b..c60e0fc04 100644
--- a/examples/powertools-examples-idempotency/pom.xml
+++ b/examples/powertools-examples-idempotency/pom.xml
@@ -203,12 +203,23 @@
                                 <source>${maven.compiler.source}</source>
                                 <target>${maven.compiler.target}</target>
                                 <complianceLevel>${maven.compiler.target}</complianceLevel>
-                                <Xlint>ignore</Xlint>
-                                <encoding>UTF-8</encoding>
+                                <aspectLibraries>
+                                    <aspectLibrary>
+                                        <groupId>software.amazon.lambda</groupId>
+                                        <artifactId>powertools-tracing</artifactId>
+                                    </aspectLibrary>
+                                    <aspectLibrary>
+                                        <groupId>software.amazon.lambda</groupId>
+                                        <artifactId>powertools-logging</artifactId>
+                                    </aspectLibrary>
+                                    <aspectLibrary>
+                                        <groupId>software.amazon.lambda</groupId>
+                                        <artifactId>powertools-idempotency</artifactId>
+                                    </aspectLibrary>
+                                </aspectLibraries>
                             </configuration>
                             <executions>
                                 <execution>
-                                    <phase>process-sources</phase>
                                     <goals>
                                         <goal>compile</goal>
                                         <goal>test-compile</goal>
diff --git a/examples/powertools-examples-sqs/pom.xml b/examples/powertools-examples-sqs/pom.xml
index e29a91eda..c74ffafda 100644
--- a/examples/powertools-examples-sqs/pom.xml
+++ b/examples/powertools-examples-sqs/pom.xml
@@ -153,12 +153,19 @@
                                 <source>${maven.compiler.source}</source>
                                 <target>${maven.compiler.target}</target>
                                 <complianceLevel>${maven.compiler.target}</complianceLevel>
-                                <Xlint>ignore</Xlint>
-                                <encoding>UTF-8</encoding>
+                                <aspectLibraries>
+                                    <aspectLibrary>
+                                        <groupId>software.amazon.lambda</groupId>
+                                        <artifactId>powertools-logging</artifactId>
+                                    </aspectLibrary>
+                                    <aspectLibrary>
+                                        <groupId>software.amazon.lambda</groupId>
+                                        <artifactId>powertools-sqs</artifactId>
+                                    </aspectLibrary>
+                                </aspectLibraries>
                             </configuration>
                             <executions>
                                 <execution>
-                                    <phase>process-sources</phase>
                                     <goals>
                                         <goal>compile</goal>
                                         <goal>test-compile</goal>

From 1e7cc7b975264239b3cbc6f8df264c0b225bbd03 Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 10:36:44 +0200
Subject: [PATCH 12/17] Some cleanup

---
 examples/powertools-examples-core/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/powertools-examples-core/pom.xml b/examples/powertools-examples-core/pom.xml
index 5dc731d96..5a1bd7bc7 100644
--- a/examples/powertools-examples-core/pom.xml
+++ b/examples/powertools-examples-core/pom.xml
@@ -13,10 +13,6 @@
         <log4j.version>2.20.0</log4j.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-        <aspectj-maven-plugin.version>1.13.1</aspectj-maven-plugin.version>
-        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
-        <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
     </properties>
 
     <dependencies>

From 3fe460a8e30ce4895588820f322915ee6834c72a Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 10:48:28 +0200
Subject: [PATCH 13/17] Remove cruft

---
 .../powertools/batch/BatchMessageHandler.java | 25 -------------------
 .../examples/ExampleMessageHandler2.java      |  2 --
 2 files changed, 27 deletions(-)
 delete mode 100644 powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/BatchMessageHandler.java
 delete mode 100644 powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/examples/ExampleMessageHandler2.java

diff --git a/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/BatchMessageHandler.java b/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/BatchMessageHandler.java
deleted file mode 100644
index 6a3427f30..000000000
--- a/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/BatchMessageHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-import com.amazonaws.services.lambda.runtime.Context;
-import com.amazonaws.services.lambda.runtime.RequestHandler;
-import com.amazonaws.services.lambda.runtime.events.SQSEvent;
-import software.amazon.lambda.powertools.batch.BatchMessageHandlerBuilder;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-
-import java.util.List;
-
-/**
- *
- * @param <T>
- */
-public abstract class BatchMessageHandler<T, U> implements RequestHandler<T, List<String>> {
-
-
-    public BatchMessageHandler() {
-    }
-
-    @Override
-    public List<String> handleRequest(T t, Context context) {
-        throw new NotImplementedException();
-    }
-
-    public abstract U processMessage(T message);
-}
diff --git a/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/examples/ExampleMessageHandler2.java b/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/examples/ExampleMessageHandler2.java
deleted file mode 100644
index 21418bb9c..000000000
--- a/powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/examples/ExampleMessageHandler2.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package software.amazon.lambda.powertools.batch.examples;public class ExampleMessageHandler2 {
-}

From 551f7e05ac557a6f031040d1bcc26f9960b02c2c Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 10:59:03 +0200
Subject: [PATCH 14/17] Add some info to readme

---
 examples/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/README.md b/examples/README.md
index c853937e0..f7e6fc620 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -1,5 +1,4 @@
 ## aws-lambda-powertools-examples
 
 This directory holds example projects demoing different components of the Powertools for AWS Lambda (Java).
-
-
+Each example can be copied from its subdirectory and used independently of the rest of this repository.
\ No newline at end of file

From 7505deb650c708d47a0be2997b9bd2c257324bdf Mon Sep 17 00:00:00 2001
From: Scott Gerring <scottgerring@users.noreply.github.com>
Date: Mon, 26 Jun 2023 17:08:37 +0200
Subject: [PATCH 15/17] Update examples/powertools-examples-core/pom.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jérôme Van Der Linden <117538+jeromevdl@users.noreply.github.com>
---
 examples/powertools-examples-core/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/powertools-examples-core/pom.xml b/examples/powertools-examples-core/pom.xml
index 5a1bd7bc7..2e0fa206a 100644
--- a/examples/powertools-examples-core/pom.xml
+++ b/examples/powertools-examples-core/pom.xml
@@ -166,7 +166,8 @@
                                     <aspectLibrary>
                                         <groupId>software.amazon.lambda</groupId>
                                         <artifactId>powertools-metrics</artifactId>
-                                    </aspectLibrary>                                </aspectLibraries>
+                                    </aspectLibrary>
+                                </aspectLibraries>
                             </configuration>
                             <executions>
                                 <execution>

From 9629436585b1d40aa9939aee10263fe10b38d6fd Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 17:21:12 +0200
Subject: [PATCH 16/17] Clarify guidance on poms

---
 examples/powertools-examples-core/pom.xml          | 10 ++++++++--
 examples/powertools-examples-idempotency/pom.xml   | 10 ++++++++--
 examples/powertools-examples-parameters/pom.xml    | 10 ++++++++--
 examples/powertools-examples-serialization/pom.xml | 10 ++++++++--
 examples/powertools-examples-sqs/pom.xml           | 10 ++++++++--
 examples/powertools-examples-validation/pom.xml    | 10 ++++++++--
 6 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/examples/powertools-examples-core/pom.xml b/examples/powertools-examples-core/pom.xml
index 5a1bd7bc7..f6aa4cd04 100644
--- a/examples/powertools-examples-core/pom.xml
+++ b/examples/powertools-examples-core/pom.xml
@@ -123,9 +123,15 @@
       </plugins>
     </build>
     <profiles>
-        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8 otherwise we'll get class
              version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
-              on the project. -->
+              on the project.
+
+              Note:
+              - if you are running Java > 1.8, you can remove this profile altogether
+              - If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
+                the profile.
+              -->
         <profile>
             <id>jdk8</id>
             <activation>
diff --git a/examples/powertools-examples-idempotency/pom.xml b/examples/powertools-examples-idempotency/pom.xml
index c60e0fc04..a0e50c85c 100644
--- a/examples/powertools-examples-idempotency/pom.xml
+++ b/examples/powertools-examples-idempotency/pom.xml
@@ -172,9 +172,15 @@
       </plugins>
     </build>
     <profiles>
-        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8 otherwise we'll get class
              version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
-              on the project. -->
+              on the project.
+
+              Note:
+              - if you are running Java > 1.8, you can remove this profile altogether
+              - If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
+                the profile.
+              -->
         <profile>
             <id>jdk8</id>
             <activation>
diff --git a/examples/powertools-examples-parameters/pom.xml b/examples/powertools-examples-parameters/pom.xml
index 365565168..c2f6c1207 100644
--- a/examples/powertools-examples-parameters/pom.xml
+++ b/examples/powertools-examples-parameters/pom.xml
@@ -89,9 +89,15 @@
       </plugins>
     </build>
     <profiles>
-        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8 otherwise we'll get class
              version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
-              on the project. -->
+              on the project.
+
+              Note:
+              - if you are running Java > 1.8, you can remove this profile altogether
+              - If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
+                the profile.
+              -->
         <profile>
             <id>jdk8</id>
             <activation>
diff --git a/examples/powertools-examples-serialization/pom.xml b/examples/powertools-examples-serialization/pom.xml
index 5dd6d94fd..371d652f0 100644
--- a/examples/powertools-examples-serialization/pom.xml
+++ b/examples/powertools-examples-serialization/pom.xml
@@ -67,9 +67,15 @@
     </build>
 
     <profiles>
-        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8 otherwise we'll get class
              version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
-              on the project. -->
+              on the project.
+
+              Note:
+              - if you are running Java > 1.8, you can remove this profile altogether
+              - If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
+                the profile.
+              -->
         <profile>
             <id>jdk8</id>
             <activation>
diff --git a/examples/powertools-examples-sqs/pom.xml b/examples/powertools-examples-sqs/pom.xml
index c74ffafda..d3de863a4 100644
--- a/examples/powertools-examples-sqs/pom.xml
+++ b/examples/powertools-examples-sqs/pom.xml
@@ -122,9 +122,15 @@
       </plugins>
     </build>
     <profiles>
-        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8 otherwise we'll get class
              version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
-              on the project. -->
+              on the project.
+
+              Note:
+              - if you are running Java > 1.8, you can remove this profile altogether
+              - If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
+                the profile.
+              -->
         <profile>
             <id>jdk8</id>
             <activation>
diff --git a/examples/powertools-examples-validation/pom.xml b/examples/powertools-examples-validation/pom.xml
index 161cde911..dbd6dee47 100644
--- a/examples/powertools-examples-validation/pom.xml
+++ b/examples/powertools-examples-validation/pom.xml
@@ -84,9 +84,15 @@
       </plugins>
     </build>
     <profiles>
-        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8, otherwise we'll get class
+        <!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8 otherwise we'll get class
              version mismatch issues. All subsequent Java releases build with the default AspectJ configuration
-              on the project. -->
+              on the project.
+
+              Note:
+              - if you are running Java > 1.8, you can remove this profile altogether
+              - If you are running on Java 1.8, you should apply the aspectJ version here to the project, and remove
+                the profile.
+              -->
         <profile>
             <id>jdk8</id>
             <activation>

From ec80866b91f0a55b2339a927110975f1e518930a Mon Sep 17 00:00:00 2001
From: Scott Gerring <gerrings@amazon.com>
Date: Mon, 26 Jun 2023 17:29:40 +0200
Subject: [PATCH 17/17] Build should use install not package on CI

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 38f99bd4e..a59e2fa71 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
           java-version: ${{ matrix.java }}
           cache: 'maven'
       - name: Build with Maven
-        run: mvn -Pbuild-without-spotbugs -B package --file pom.xml
+        run: mvn -Pbuild-without-spotbugs -B install --file pom.xml
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # 3.1.1
         if: ${{ matrix.java == '11' }} # publish results once