From 2a126b45cef5ec528513c3176128165b68eb4027 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 09:12:37 +0000
Subject: [PATCH 1/2] chore: bump org.junit:junit-bom from 5.14.0 to 6.1.3

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.14.0 to 6.1.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.14.0...r6.1.3)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 6.1.3
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 689a2e0c3..57d1b69ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
         <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.4.0</maven-source-plugin.version>
         <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
-        <junit.version>5.14.0</junit.version>
+        <junit.version>6.1.3</junit.version>
         <aws-embedded-metrics.version>4.1.2</aws-embedded-metrics.version>
         <jmespath.version>0.6.0</jmespath.version>
         <aws.sdk.v1.version>1.12.781</aws.sdk.v1.version>

From 5f98eabd818eb33950d747ad54ce802f5be675a7 Mon Sep 17 00:00:00 2001
From: Philipp Page <pagejep@amazon.com>
Date: Wed, 7 Oct 2026 14:19:11 +0200
Subject: [PATCH 2/2] fix(ci): initialize JUnit 6 discovery classes at build
 time for GraalVM native tests

native-maven-plugin 0.11.5 does not list MethodSegmentResolver and
DiscoveryIssueReportingDiscoveryListener in its JDK 21 build-time
initialization list, which breaks native test images with JUnit 6.
Add them through a JDK-activated profile until native-maven-plugin is
upgraded (graalvm/native-build-tools#794).
---
 pom.xml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/pom.xml b/pom.xml
index 57d1b69ed..87872f212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -690,6 +690,36 @@
                 </plugins>
             </build>
         </profile>
+        <!--
+            On GraalVM for JDK 21 and earlier, the junit-platform-native feature initializes a hardcoded list of
+            JUnit classes at build time. native-maven-plugin 0.11.5 does not list the following JUnit 6 classes,
+            which breaks native test image builds. Newer native-build-tools releases include them
+            (graalvm/native-build-tools#794). Remove this profile after modernizing the GraalVM native-image test
+            infrastructure and upgrading native-maven-plugin to 1.x:
+            - https://github.com/aws-powertools/powertools-lambda-java/issues/2416
+            - https://github.com/aws-powertools/powertools-lambda-java/pull/2661
+        -->
+        <profile>
+            <id>native-junit6-jdk21</id>
+            <activation>
+                <jdk>(,22)</jdk>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.graalvm.buildtools</groupId>
+                            <artifactId>native-maven-plugin</artifactId>
+                            <configuration>
+                                <buildArgs combine.children="append">
+                                    <buildArg>--initialize-at-build-time=org.junit.jupiter.engine.discovery.MethodSegmentResolver,org.junit.platform.launcher.core.DiscoveryIssueReportingDiscoveryListener</buildArg>
+                                </buildArgs>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
         <!--
             The native profile configures surefire to pass add-opens flags via JDK_JAVA_OPTIONS.
             This is necessary because the native-maven-plugin's NativeExtension overwrites surefire's