From db329e56e6835160241a4022ff598e3532926d92 Mon Sep 17 00:00:00 2001
From: Jerome Van Der Linden <jeromevdl@gmail.com>
Date: Fri, 2 Jun 2023 18:38:12 +0200
Subject: [PATCH] E2E Tests on Java 17

---
 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-e2e-tests/pom.xml                                  | 4 ++--
 .../amazon/lambda/powertools/testutils/Infrastructure.java    | 2 ++
 .../amazon/lambda/powertools/testutils/JavaRuntime.java       | 3 ++-
 8 files changed, 12 insertions(+), 9 deletions(-)

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 ca05dd290..5e7a9caa2 100644
--- a/powertools-e2e-tests/handlers/pom.xml
+++ b/powertools-e2e-tests/handlers/pom.xml
@@ -99,9 +99,9 @@
                     </dependencies>
                 </plugin>
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
+                    <groupId>dev.aspectj</groupId>
                     <artifactId>aspectj-maven-plugin</artifactId>
-                    <version>${aspectj.version}</version>
+                    <version>1.13.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
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-e2e-tests/pom.xml b/powertools-e2e-tests/pom.xml
index 1d71159b2..3234ac0a5 100644
--- a/powertools-e2e-tests/pom.xml
+++ b/powertools-e2e-tests/pom.xml
@@ -17,8 +17,8 @@
         <!-- we can use Java 11 for integration tests, not forced to stick to Java 8 -->
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        <constructs.version>10.2.25</constructs.version>
-        <cdk.version>2.47.0</cdk.version>
+        <constructs.version>10.2.30</constructs.version>
+        <cdk.version>2.79.1</cdk.version>
 
         <!-- Don't deploy the e2e tests -->
         <maven.deploy.skip>true</maven.deploy.skip>
diff --git a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java
index f3659e5c7..1fdbd3836 100644
--- a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java
+++ b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java
@@ -162,6 +162,8 @@ private void getJavaRuntime() {
                 runtime = JavaRuntime.JAVA8AL2;
             } else if (javaVersion.startsWith("11")) {
                 runtime = JavaRuntime.JAVA11;
+            } else if (javaVersion.startsWith("17")) {
+                runtime = JavaRuntime.JAVA17;
             } else {
                 throw new IllegalArgumentException("Unsupported Java version " + javaVersion);
             }
diff --git a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java
index 94ec13518..dce97538f 100644
--- a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java
+++ b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java
@@ -5,7 +5,8 @@
 public enum JavaRuntime {
     JAVA8("java8", Runtime.JAVA_8, "1.8"),
     JAVA8AL2("java8.al2", Runtime.JAVA_8_CORRETTO, "1.8"),
-    JAVA11("java11", Runtime.JAVA_11, "11");
+    JAVA11("java11", Runtime.JAVA_11, "11"),
+    JAVA17("java17", Runtime.JAVA_17, "17");
 
     private final String runtime;
     private final Runtime cdkRuntime;