From 1901fac6f7224288396cdc4b44bf0ae53a0f35a5 Mon Sep 17 00:00:00 2001
From: Davide Melfi <dmelfi@amazon.com>
Date: Sat, 23 May 2026 08:20:20 +0100
Subject: [PATCH 1/2] build: Pin compilation to JDK 8 via Maven Toolchains

---
 aws-lambda-java-core/pom.xml                  | 26 +++++++++++++++++++
 .../pom.xml                                   | 21 +++++++++++++++
 aws-lambda-java-events/pom.xml                | 26 +++++++++++++++++++
 .../pom.xml                                   | 21 +++++++++++++++
 aws-lambda-java-serialization/pom.xml         | 21 +++++++++++++++
 aws-lambda-java-tests/pom.xml                 | 21 +++++++++++++++
 6 files changed, 136 insertions(+)

diff --git a/aws-lambda-java-core/pom.xml b/aws-lambda-java-core/pom.xml
index cca9d0cdf..0a11aa517 100644
--- a/aws-lambda-java-core/pom.xml
+++ b/aws-lambda-java-core/pom.xml
@@ -36,6 +36,32 @@
     <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-toolchains-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <toolchains>
+            <jdk>
+              <!-- Range matches both "8" (e.g. actions/setup-java)
+                   and "1.8" (legacy / hand-written toolchains). -->
+              <version>[1.8,9)</version>
+            </jdk>
+          </toolchains>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>toolchain</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>dev</id>
diff --git a/aws-lambda-java-events-sdk-transformer/pom.xml b/aws-lambda-java-events-sdk-transformer/pom.xml
index 6de599ef7..11054be12 100644
--- a/aws-lambda-java-events-sdk-transformer/pom.xml
+++ b/aws-lambda-java-events-sdk-transformer/pom.xml
@@ -79,6 +79,27 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-toolchains-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <toolchains>
+            <jdk>
+              <!-- Range matches both "8" (e.g. actions/setup-java)
+                   and "1.8" (legacy / hand-written toolchains). -->
+              <version>[1.8,9)</version>
+            </jdk>
+          </toolchains>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>toolchain</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${maven-surefire-plugin.version}</version>
diff --git a/aws-lambda-java-events/pom.xml b/aws-lambda-java-events/pom.xml
index c8c40e0c7..1ac5d7981 100644
--- a/aws-lambda-java-events/pom.xml
+++ b/aws-lambda-java-events/pom.xml
@@ -42,6 +42,32 @@
         <junit-jupiter.version>5.12.2</junit-jupiter.version>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-toolchains-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <toolchains>
+                        <jdk>
+                            <!-- Range matches both "8" (e.g. actions/setup-java)
+                                 and "1.8" (legacy / hand-written toolchains). -->
+                            <version>[1.8,9)</version>
+                        </jdk>
+                    </toolchains>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>toolchain</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <distributionManagement>
         <repository>
             <id>sonatype-nexus-staging</id>
diff --git a/aws-lambda-java-runtime-interface-client/pom.xml b/aws-lambda-java-runtime-interface-client/pom.xml
index 2ba71c43c..fa543df00 100644
--- a/aws-lambda-java-runtime-interface-client/pom.xml
+++ b/aws-lambda-java-runtime-interface-client/pom.xml
@@ -115,6 +115,27 @@
             </extension>
         </extensions>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-toolchains-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <toolchains>
+                        <jdk>
+                            <!-- Range matches both "8" (e.g. actions/setup-java)
+                                 and "1.8" (legacy / hand-written toolchains). -->
+                            <version>[1.8,9)</version>
+                        </jdk>
+                    </toolchains>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>toolchain</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-install-plugin</artifactId>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/aws-lambda-java-serialization/pom.xml b/aws-lambda-java-serialization/pom.xml
index 60a3c67a9..503f3e76f 100644
--- a/aws-lambda-java-serialization/pom.xml
+++ b/aws-lambda-java-serialization/pom.xml
@@ -191,6 +191,27 @@
             </extension>
         </extensions>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-toolchains-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <toolchains>
+                        <jdk>
+                            <!-- Range matches both "8" (e.g. actions/setup-java)
+                                 and "1.8" (legacy / hand-written toolchains). -->
+                            <version>[1.8,9)</version>
+                        </jdk>
+                    </toolchains>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>toolchain</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
diff --git a/aws-lambda-java-tests/pom.xml b/aws-lambda-java-tests/pom.xml
index 5e5f19b33..4a25586ce 100644
--- a/aws-lambda-java-tests/pom.xml
+++ b/aws-lambda-java-tests/pom.xml
@@ -245,6 +245,27 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-toolchains-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <toolchains>
+                        <jdk>
+                            <!-- Range matches both "8" (e.g. actions/setup-java)
+                                 and "1.8" (legacy / hand-written toolchains). -->
+                            <version>[1.8,9)</version>
+                        </jdk>
+                    </toolchains>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>toolchain</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

From 4acf4aa4f34bb78e04492bb890e419be1209252d Mon Sep 17 00:00:00 2001
From: Fabiana Severin <fabisev@amazon.com>
Date: Tue, 14 Jul 2026 17:13:25 +0100
Subject: [PATCH 2/2] fix: Add toolchains.xml to codebuild agent for JDK 8
 resolution

The maven-toolchains-plugin requires JDK 8 to be declared in
~/.m2/toolchains.xml. The smoke test Docker agent has Corretto 8
installed but was missing this file, causing the build to fail.
---
 .../test/integration/codebuild-local/Dockerfile.agent       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/aws-lambda-java-runtime-interface-client/test/integration/codebuild-local/Dockerfile.agent b/aws-lambda-java-runtime-interface-client/test/integration/codebuild-local/Dockerfile.agent
index 3dbdb3c68..3ebbbb3a2 100644
--- a/aws-lambda-java-runtime-interface-client/test/integration/codebuild-local/Dockerfile.agent
+++ b/aws-lambda-java-runtime-interface-client/test/integration/codebuild-local/Dockerfile.agent
@@ -11,4 +11,8 @@ COPY --from=docker/buildx-bin:latest /buildx /usr/libexec/docker/cli-plugins/doc
 ENV PATH="$PATH:/apache-maven/bin"
 RUN mkdir /apache-maven && \
     curl https://archive.apache.org/dist/maven/maven-3/3.8.7/binaries/apache-maven-3.8.7-bin.tar.gz | \
-    tar -xz -C /apache-maven --strip-components 1
\ No newline at end of file
+    tar -xz -C /apache-maven --strip-components 1
+
+# Declare JDK 8 in toolchains.xml so maven-toolchains-plugin can resolve it
+RUN mkdir -p /root/.m2 && \
+    printf '<?xml version="1.0" encoding="UTF-8"?>\n<toolchains>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <version>8</version>\n    </provides>\n    <configuration>\n      <jdkHome>/usr/lib/jvm/java-1.8.0-amazon-corretto</jdkHome>\n    </configuration>\n  </toolchain>\n</toolchains>\n' > /root/.m2/toolchains.xml