diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3fbb127b4..192eb6686 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -125,6 +125,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         npm:
           - 8
           - 9
@@ -158,6 +159,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
@@ -185,6 +187,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
@@ -193,7 +196,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '21'
       - run: make init
       - run: pytest -vv tests/integration/workflows/java_maven
 
@@ -215,6 +218,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
@@ -223,7 +227,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
       - run: make init
       - run: pytest -vv tests/integration/workflows/java_gradle
 
@@ -243,6 +247,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
@@ -267,11 +272,16 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
+      - run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade setuptools
+        if: ${{ matrix.os }} == 'ubuntu-latest' && ${{ matrix.python }} == '3.12'
       - run: make init
       - run: pytest -vv tests/integration/workflows/python_pip
 
@@ -291,6 +301,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
@@ -321,6 +332,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
diff --git a/aws_lambda_builders/__init__.py b/aws_lambda_builders/__init__.py
index 79fc339c2..047943ec1 100644
--- a/aws_lambda_builders/__init__.py
+++ b/aws_lambda_builders/__init__.py
@@ -5,5 +5,5 @@
 # Changing version will trigger a new release!
 # Please make the version change as the last step of your development.
 
-__version__ = "1.41.0"
+__version__ = "1.42.0"
 RPC_PROTOCOL_VERSION = "0.3"
diff --git a/aws_lambda_builders/validator.py b/aws_lambda_builders/validator.py
index 534068e22..0306ce14d 100644
--- a/aws_lambda_builders/validator.py
+++ b/aws_lambda_builders/validator.py
@@ -20,11 +20,13 @@
     "python3.9": [ARM64, X86_64],
     "python3.10": [ARM64, X86_64],
     "python3.11": [ARM64, X86_64],
+    "python3.12": [ARM64, X86_64],
     "ruby2.7": [ARM64, X86_64],
     "ruby3.2": [ARM64, X86_64],
     "java8": [ARM64, X86_64],
     "java11": [ARM64, X86_64],
     "java17": [ARM64, X86_64],
+    "java21": [ARM64, X86_64],
     "go1.x": [ARM64, X86_64],
     "dotnet6": [ARM64, X86_64],
     "provided": [ARM64, X86_64],
diff --git a/aws_lambda_builders/workflows/python_pip/DESIGN.md b/aws_lambda_builders/workflows/python_pip/DESIGN.md
index a53f2b518..c1d9fadb8 100644
--- a/aws_lambda_builders/workflows/python_pip/DESIGN.md
+++ b/aws_lambda_builders/workflows/python_pip/DESIGN.md
@@ -49,7 +49,7 @@ def build_dependencies(artifacts_dir_path,
 
     :type runtime: str
     :param runtime: Python version to build dependencies for. This can
-        either be python3.7, python3.8, python3.9, python3.10 or python3.11. These are
+        either be python3.7, python3.8, python3.9, python3.10, python3.11 or python3.12. These are
         currently the only supported values.
 
     :type ui: :class:`lambda_builders.actions.python_pip.utils.UI`
diff --git a/aws_lambda_builders/workflows/python_pip/packager.py b/aws_lambda_builders/workflows/python_pip/packager.py
index 372868d03..252e45f7a 100644
--- a/aws_lambda_builders/workflows/python_pip/packager.py
+++ b/aws_lambda_builders/workflows/python_pip/packager.py
@@ -87,6 +87,7 @@ def get_lambda_abi(runtime):
         "python3.9": "cp39",
         "python3.10": "cp310",
         "python3.11": "cp311",
+        "python3.12": "cp312",
     }
 
     if runtime not in supported:
@@ -101,7 +102,7 @@ def __init__(self, runtime, osutils=None, dependency_builder=None, architecture=
 
         :type runtime: str
         :param runtime: Python version to build dependencies for. This can
-            either be python3.7, python3.8, python3.9, python3.10 or python3.11. These are currently the
+            either be python3.7, python3.8, python3.9, python3.10, python3.11 or python3.12. These are currently the
             only supported values.
 
         :type osutils: :class:`lambda_builders.utils.OSUtils`
diff --git a/setup.py b/setup.py
index ba5d6ea78..bcd79b7f1 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ def read_version():
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Internet",
         "Topic :: Software Development :: Build Tools",
         "Topic :: Utilities",
diff --git a/tests/integration/workflows/java_gradle/test_java_gradle.py b/tests/integration/workflows/java_gradle/test_java_gradle.py
index bddb08bac..1c924445c 100644
--- a/tests/integration/workflows/java_gradle/test_java_gradle.py
+++ b/tests/integration/workflows/java_gradle/test_java_gradle.py
@@ -24,6 +24,7 @@
         ["java8"],
         ["java11"],
         ["java17"],
+        ["java21"],
     ],
 )
 class TestJavaGradle(TestCase):
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/build.gradle
new file mode 100644
index 000000000..5c41c8421
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/build.gradle
@@ -0,0 +1,5 @@
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/common/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/common/build.gradle
new file mode 100644
index 000000000..5777edd66
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/common/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'software.amazon.awssdk:annotations:2.1.0'
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
\ No newline at end of file
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java
new file mode 100644
index 000000000..542be0095
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Foo {
+    public void sayHello() {
+        System.out.println("Hello world!");
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda1/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda1/build.gradle
new file mode 100644
index 000000000..ab7ce4736
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda1/build.gradle
@@ -0,0 +1,15 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'software.amazon.awssdk:annotations:2.1.0'
+    implementation project(':common')
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
\ No newline at end of file
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java
new file mode 100644
index 000000000..fca189e70
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Lambda1_Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda2/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda2/build.gradle
new file mode 100644
index 000000000..5777edd66
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda2/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'software.amazon.awssdk:annotations:2.1.0'
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
\ No newline at end of file
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java
new file mode 100644
index 000000000..5f7fa59ef
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Lambda2_Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/settings.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/settings.gradle
new file mode 100644
index 000000000..965186cb4
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps-inter-module/settings.gradle
@@ -0,0 +1,2 @@
+rootProject.name = 'multi-build'
+include 'lambda1', 'lambda2', 'common'
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/build.gradle
new file mode 100644
index 000000000..5c41c8421
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/build.gradle
@@ -0,0 +1,5 @@
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda1/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda1/build.gradle
new file mode 100644
index 000000000..5777edd66
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda1/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'software.amazon.awssdk:annotations:2.1.0'
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
\ No newline at end of file
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java
new file mode 100644
index 000000000..fca189e70
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Lambda1_Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda2/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda2/build.gradle
new file mode 100644
index 000000000..5777edd66
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda2/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'software.amazon.awssdk:annotations:2.1.0'
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
\ No newline at end of file
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java
new file mode 100644
index 000000000..5f7fa59ef
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Lambda2_Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/settings.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/settings.gradle
new file mode 100644
index 000000000..6c882858a
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java21/with-deps/settings.gradle
@@ -0,0 +1,2 @@
+rootProject.name = 'multi-build'
+include 'lambda1', 'lambda2'
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/build.gradle
index 7814fef72..f98636ce6 100644
--- a/tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/build.gradle
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/build.gradle
@@ -18,8 +18,8 @@ dependencies {
 group = 'aws.lambdabuilders'
 version = '1.0'
 description = 'common-layer-gradle'
-java.sourceCompatibility = JavaVersion.VERSION_11
-java.targetCompatibility = JavaVersion.VERSION_11
+java.sourceCompatibility = JavaVersion.VERSION_17
+java.targetCompatibility = JavaVersion.VERSION_17
 
 build.finalizedBy publishToMavenLocal
 
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/build.gradle
new file mode 100644
index 000000000..44b55b72f
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/build.gradle
@@ -0,0 +1,32 @@
+plugins {
+    id 'java'
+    id 'java-library'
+    id 'maven-publish'
+}
+
+repositories {
+    mavenLocal()
+    maven {
+        url = uri('https://repo.maven.apache.org/maven2/')
+    }
+}
+
+dependencies {
+    api 'com.amazonaws:aws-lambda-java-core:1.2.0'
+}
+
+group = 'aws.lambdabuilders'
+version = '1.0'
+description = 'common-layer-gradle'
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
+
+build.finalizedBy publishToMavenLocal
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from(components.java)
+        }
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/settings.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/settings.gradle
new file mode 100644
index 000000000..c7a980f9f
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'common-layer-gradle'
\ No newline at end of file
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/src/main/java/aws/lambdabuilders/CommonCode.java b/tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/src/main/java/aws/lambdabuilders/CommonCode.java
new file mode 100644
index 000000000..64466d0e9
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/layer/src/main/java/aws/lambdabuilders/CommonCode.java
@@ -0,0 +1,10 @@
+package aws.lambdabuilders;
+
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
+
+public class CommonCode {
+
+    public static void doSomethingOnLayer(final LambdaLogger logger, final String s) {
+        logger.log("Doing something on layer" + s);
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-broken/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-broken/build.gradle
new file mode 100644
index 000000000..0e5db4994
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-broken/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'software.amazon.awssdk:does-not-exist:1.2.3'
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
\ No newline at end of file
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java
new file mode 100644
index 000000000..22c7a289d
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/build.gradle
new file mode 100644
index 000000000..5777edd66
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'software.amazon.awssdk:annotations:2.1.0'
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
\ No newline at end of file
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..41d9927a4
Binary files /dev/null and b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..e411586a5
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradlew b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradlew
new file mode 100755
index 000000000..1b6c78733
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradlew.bat b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradlew.bat
new file mode 100644
index 000000000..107acd32c
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java
new file mode 100644
index 000000000..22c7a289d
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps/build.gradle
new file mode 100644
index 000000000..e4af9df15
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps/build.gradle
@@ -0,0 +1,11 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'software.amazon.awssdk:annotations:2.1.0'
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps/src/main/java/aws/lambdabuilders/Main.java
new file mode 100644
index 000000000..22c7a289d
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-deps/src/main/java/aws/lambdabuilders/Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-layer-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-layer-deps/build.gradle
new file mode 100644
index 000000000..c7bd24801
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-layer-deps/build.gradle
@@ -0,0 +1,29 @@
+plugins {
+    id 'java'
+    id 'maven-publish'
+}
+
+repositories {
+    mavenLocal()
+    maven {
+        url = uri('https://repo.maven.apache.org/maven2/')
+    }
+}
+
+dependencies {
+    compileOnly 'aws.lambdabuilders:common-layer-gradle:1.0'
+}
+
+group = 'helloworld'
+version = '1.0'
+description = 'A sample Hello World created for SAM CLI.'
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from(components.java)
+        }
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java
new file mode 100644
index 000000000..d68611b84
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java
@@ -0,0 +1,16 @@
+package aws.lambdabuilders;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+
+import aws.lambdabuilders.CommonCode;
+
+public class Main implements RequestHandler<Object, Object> {
+    public Object handleRequest(final Object input, final Context context) {
+        final LambdaLogger logger = context.getLogger();
+        CommonCode.doSomethingOnLayer(logger, "fromLambdaFunction");
+        System.out.println("Hello AWS Lambda Builders!");
+        return "Done";
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-resources/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-resources/build.gradle
new file mode 100644
index 000000000..5777edd66
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-resources/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'software.amazon.awssdk:annotations:2.1.0'
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
\ No newline at end of file
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-resources/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-resources/src/main/java/aws/lambdabuilders/Main.java
new file mode 100644
index 000000000..22c7a289d
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-resources/src/main/java/aws/lambdabuilders/Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-resources/src/main/resources/some_data.txt b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-resources/src/main/resources/some_data.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-test-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-test-deps/build.gradle
new file mode 100644
index 000000000..3cb62bc52
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-test-deps/build.gradle
@@ -0,0 +1,15 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'software.amazon.awssdk:annotations:2.1.0'
+    testImplementation 'software.amazon.awssdk:s3:2.1.0'
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
\ No newline at end of file
diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-test-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-test-deps/src/main/java/aws/lambdabuilders/Main.java
new file mode 100644
index 000000000..22c7a289d
--- /dev/null
+++ b/tests/integration/workflows/java_gradle/testdata/single-build/java21/with-test-deps/src/main/java/aws/lambdabuilders/Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_maven/test_java_maven.py b/tests/integration/workflows/java_maven/test_java_maven.py
index 8f252991d..a72363c96 100644
--- a/tests/integration/workflows/java_maven/test_java_maven.py
+++ b/tests/integration/workflows/java_maven/test_java_maven.py
@@ -23,6 +23,7 @@
         ["java8"],
         ["java11"],
         ["java17"],
+        ["java21"],
     ],
 )
 class TestJavaMaven(TestCase):
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/layer/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java21/layer/pom.xml
new file mode 100644
index 000000000..a7fa8ebe6
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/layer/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>aws.lambdabuilders</groupId>
+    <artifactId>common-layer</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+    </properties>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/layer/src/main/java/aws/lambdabuilders/CommonCode.java b/tests/integration/workflows/java_maven/testdata/single-build/java21/layer/src/main/java/aws/lambdabuilders/CommonCode.java
new file mode 100644
index 000000000..64466d0e9
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/layer/src/main/java/aws/lambdabuilders/CommonCode.java
@@ -0,0 +1,10 @@
+package aws.lambdabuilders;
+
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
+
+public class CommonCode {
+
+    public static void doSomethingOnLayer(final LambdaLogger logger, final String s) {
+        logger.log("Doing something on layer" + s);
+    }
+}
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/no-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java21/no-deps/pom.xml
new file mode 100644
index 000000000..3b59364fa
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/no-deps/pom.xml
@@ -0,0 +1,13 @@
+<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>helloworld</groupId>
+    <artifactId>HelloWorld</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>A sample Hello World created for SAM CLI.</name>
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+    </properties>
+</project>
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/no-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java21/no-deps/src/main/java/aws/lambdabuilders/Main.java
new file mode 100644
index 000000000..22c7a289d
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/no-deps/src/main/java/aws/lambdabuilders/Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/no-deps/src/main/resources/some_data.txt b/tests/integration/workflows/java_maven/testdata/single-build/java21/no-deps/src/main/resources/some_data.txt
new file mode 100644
index 000000000..95d09f2b1
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/no-deps/src/main/resources/some_data.txt
@@ -0,0 +1 @@
+hello world
\ No newline at end of file
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps-broken/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps-broken/pom.xml
new file mode 100644
index 000000000..05f91babe
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps-broken/pom.xml
@@ -0,0 +1,27 @@
+<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>helloworld</groupId>
+    <artifactId>HelloWorld</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>A sample Hello World created for SAM CLI.</name>
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>annotations</artifactId>
+            <version>2.1.0-helloworld</version>
+        </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>4.12</version>
+          <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java
new file mode 100644
index 000000000..22c7a289d
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps/pom.xml
new file mode 100644
index 000000000..4837ebbac
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps/pom.xml
@@ -0,0 +1,27 @@
+<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>helloworld</groupId>
+    <artifactId>HelloWorld</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>A sample Hello World created for SAM CLI.</name>
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>annotations</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>4.12</version>
+          <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps/src/main/java/aws/lambdabuilders/Main.java
new file mode 100644
index 000000000..22c7a289d
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps/src/main/java/aws/lambdabuilders/Main.java
@@ -0,0 +1,7 @@
+package aws.lambdabuilders;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello AWS Lambda Builders!");
+    }
+}
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps/src/main/resources/some_data.txt b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps/src/main/resources/some_data.txt
new file mode 100644
index 000000000..95d09f2b1
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-deps/src/main/resources/some_data.txt
@@ -0,0 +1 @@
+hello world
\ No newline at end of file
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/with-layer-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-layer-deps/pom.xml
new file mode 100644
index 000000000..63572eaad
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-layer-deps/pom.xml
@@ -0,0 +1,22 @@
+<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>helloworld</groupId>
+    <artifactId>HelloWorld</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>A sample Hello World created for SAM CLI.</name>
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>aws.lambdabuilders</groupId>
+            <artifactId>common-layer</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java21/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java
new file mode 100644
index 000000000..d68611b84
--- /dev/null
+++ b/tests/integration/workflows/java_maven/testdata/single-build/java21/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java
@@ -0,0 +1,16 @@
+package aws.lambdabuilders;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+
+import aws.lambdabuilders.CommonCode;
+
+public class Main implements RequestHandler<Object, Object> {
+    public Object handleRequest(final Object input, final Context context) {
+        final LambdaLogger logger = context.getLogger();
+        CommonCode.doSomethingOnLayer(logger, "fromLambdaFunction");
+        System.out.println("Hello AWS Lambda Builders!");
+        return "Done";
+    }
+}
diff --git a/tests/integration/workflows/python_pip/test_python_pip.py b/tests/integration/workflows/python_pip/test_python_pip.py
index 58ee07298..e93781224 100644
--- a/tests/integration/workflows/python_pip/test_python_pip.py
+++ b/tests/integration/workflows/python_pip/test_python_pip.py
@@ -18,7 +18,7 @@
 logger = logging.getLogger("aws_lambda_builders.workflows.python_pip.workflow")
 IS_WINDOWS = platform.system().lower() == "windows"
 NOT_ARM = platform.processor() != "aarch64"
-ARM_RUNTIMES = {"python3.8", "python3.9", "python3.10", "python3.11"}
+ARM_RUNTIMES = {"python3.8", "python3.9", "python3.10", "python3.11", "python3.12"}
 
 
 @parameterized_class(("experimental_flags",), [([]), ([EXPERIMENTAL_FLAG_BUILD_PERFORMANCE])])
@@ -64,6 +64,7 @@ def setUp(self):
             "python3.9": "python3.7",
             "python3.10": "python3.9",
             "python3.11": "python3.10",
+            "python3.12": "python3.11",
         }
 
     def tearDown(self):
@@ -96,7 +97,10 @@ def test_must_build_python_project(self):
             experimental_flags=self.experimental_flags,
         )
 
-        if self.runtime in ("python3.10", "python3.11"):
+        if self.runtime in ("python3.12"):
+            self.check_architecture_in("numpy-1.26.1.dist-info", ["manylinux2014_x86_64", "manylinux1_x86_64"])
+            expected_files = self.test_data_files.union({"numpy", "numpy-1.26.1.dist-info", "numpy.libs"})
+        elif self.runtime in ("python3.10", "python3.11"):
             self.check_architecture_in("numpy-1.23.5.dist-info", ["manylinux2014_x86_64", "manylinux1_x86_64"])
             expected_files = self.test_data_files.union({"numpy", "numpy-1.23.5.dist-info", "numpy.libs"})
         else:
@@ -123,7 +127,10 @@ def test_must_build_python_project_python3_binary(self):
                 executable_search_paths=[executable_dir],
             )
 
-            if self.runtime in ("python3.10", "python3.11"):
+            if self.runtime in ("python3.12"):
+                self.check_architecture_in("numpy-1.26.1.dist-info", ["manylinux2014_x86_64", "manylinux1_x86_64"])
+                expected_files = self.test_data_files.union({"numpy", "numpy-1.26.1.dist-info", "numpy.libs"})
+            elif self.runtime in ("python3.10", "python3.11", "python3.12"):
                 self.check_architecture_in("numpy-1.23.5.dist-info", ["manylinux2014_x86_64", "manylinux1_x86_64"])
                 expected_files = self.test_data_files.union({"numpy", "numpy-1.23.5.dist-info", "numpy.libs"})
             else:
@@ -168,12 +175,16 @@ def test_must_build_python_project_with_arm_architecture(self):
             experimental_flags=self.experimental_flags,
         )
         expected_files = self.test_data_files.union({"numpy", "numpy.libs", "numpy-1.20.3.dist-info"})
+        if self.runtime in ("python3.12"):
+            expected_files = self.test_data_files.union({"numpy", "numpy.libs", "numpy-1.26.1.dist-info"})
         if self.runtime in ("python3.10", "python3.11"):
             expected_files = self.test_data_files.union({"numpy", "numpy.libs", "numpy-1.23.5.dist-info"})
         output_files = set(os.listdir(self.artifacts_dir))
         self.assertEqual(expected_files, output_files)
 
-        if self.runtime in ("python3.10", "python3.11"):
+        if self.runtime in ("python3.12"):
+            self.check_architecture_in("numpy-1.26.1.dist-info", ["manylinux2014_aarch64"])
+        elif self.runtime in ("python3.10", "python3.11"):
             self.check_architecture_in("numpy-1.23.5.dist-info", ["manylinux2014_aarch64"])
         else:
             self.check_architecture_in("numpy-1.20.3.dist-info", ["manylinux2014_aarch64"])
@@ -245,7 +256,10 @@ def test_must_resolve_unknown_package_name(self):
             runtime=self.runtime,
             experimental_flags=self.experimental_flags,
         )
-        expected_files = self.test_data_files.union(["inflate64", "inflate64.libs", "inflate64-0.1.4.dist-info"])
+        if self.runtime in ("python3.7"):
+            expected_files = self.test_data_files.union(["inflate64", "inflate64-0.3.1.dist-info"])
+        else:
+            expected_files = self.test_data_files.union(["inflate64", "inflate64-1.0.0.dist-info"])
         output_files = set(os.listdir(self.artifacts_dir))
         for f in expected_files:
             self.assertIn(f, output_files)
diff --git a/tests/integration/workflows/python_pip/testdata/requirements-inflate.txt b/tests/integration/workflows/python_pip/testdata/requirements-inflate.txt
index 0680f795f..59b3fff69 100644
--- a/tests/integration/workflows/python_pip/testdata/requirements-inflate.txt
+++ b/tests/integration/workflows/python_pip/testdata/requirements-inflate.txt
@@ -1 +1,2 @@
-inflate64==0.1.4 --no-binary=:inflate64:
\ No newline at end of file
+inflate64==0.3.1; python_version < '3.8' --no-binary=:inflate64:
+inflate64==1.0.0; python_version >= '3.8' --no-binary=:inflate64:
\ No newline at end of file
diff --git a/tests/integration/workflows/python_pip/testdata/requirements-numpy.txt b/tests/integration/workflows/python_pip/testdata/requirements-numpy.txt
index 965a49f92..cf49c86eb 100644
--- a/tests/integration/workflows/python_pip/testdata/requirements-numpy.txt
+++ b/tests/integration/workflows/python_pip/testdata/requirements-numpy.txt
@@ -4,4 +4,5 @@ numpy==1.20.3; python_version == '3.7'
 numpy==1.20.3; python_version == '3.8'
 numpy==1.20.3; python_version == '3.9'
 numpy==1.23.5; python_version == '3.10'
-numpy==1.23.5; python_version == '3.11'
\ No newline at end of file
+numpy==1.23.5; python_version == '3.11'
+numpy==1.26.1; python_version == '3.12'
diff --git a/tests/unit/workflows/java_gradle/test_gradle_validator.py b/tests/unit/workflows/java_gradle/test_gradle_validator.py
index fc0bd3b84..2815b4f68 100644
--- a/tests/unit/workflows/java_gradle/test_gradle_validator.py
+++ b/tests/unit/workflows/java_gradle/test_gradle_validator.py
@@ -78,23 +78,22 @@ def test_emits_warning_when_version_string_not_found(self):
         validator.validate(runtime_path=self.runtime_path)
         self.mock_log.warning.assert_called_with(GradleValidator.VERSION_STRING_WARNING, self.runtime_path)
 
-    def test_no_warning_when_jvm_mv_11_and_java11_runtime(self):
-        version_string = "JVM:          11.0.0".encode()
+    @parameterized.expand(
+        [
+            ("11.0.0", "java11"),
+            ("17.0.0", "java17"),
+            ("21.0.0", "java21"),
+        ]
+    )
+    def test_no_warning_when_jvm_mv_matches_runtime(self, version, runtime):
+        version_string = f"JVM:          {version}".encode()
         self.mock_os_utils.popen.side_effect = [FakePopen(stdout=version_string)]
         validator = GradleValidator(
-            runtime="java11", architecture=self.architecture, os_utils=self.mock_os_utils, log=self.mock_log
-        )
-        self.assertTrue(validator.validate(runtime_path=self.runtime_path))
-        self.assertEqual(validator.validated_binary_path, self.runtime_path)
-
-    def test_no_warning_when_jvm_mv_17_and_java17_runtime(self):
-        version_string = "JVM:          17.0.0".encode()
-        self.mock_os_utils.popen.side_effect = [FakePopen(stdout=version_string)]
-        validator = GradleValidator(
-            runtime="java17", architecture=self.architecture, os_utils=self.mock_os_utils, log=self.mock_log
+            runtime=runtime, architecture=self.architecture, os_utils=self.mock_os_utils, log=self.mock_log
         )
         self.assertTrue(validator.validate(runtime_path=self.runtime_path))
         self.assertEqual(validator.validated_binary_path, self.runtime_path)
+        self.mock_log.warning.assert_not_called()
 
     def test_runtime_validate_unsupported_language_fail_open(self):
         validator = GradleValidator(runtime="java2.0", architecture="arm64")
diff --git a/tests/unit/workflows/python_pip/test_packager.py b/tests/unit/workflows/python_pip/test_packager.py
index 355c5da71..5b8db0216 100644
--- a/tests/unit/workflows/python_pip/test_packager.py
+++ b/tests/unit/workflows/python_pip/test_packager.py
@@ -106,6 +106,9 @@ def test_get_lambda_abi_python310(self):
     def test_get_lambda_abi_python311(self):
         assert "cp311" == get_lambda_abi("python3.11")
 
+    def test_get_lambda_abi_python312(self):
+        assert "cp312" == get_lambda_abi("python3.12")
+
 
 class TestPythonPipDependencyBuilder(object):
     def test_can_call_dependency_builder(self, osutils):