From 0263599a55d039c3609ac3e8542bfa725d4490e7 Mon Sep 17 00:00:00 2001
From: Mark Curtis <curtisms@amazon.com>
Date: Thu, 2 Apr 2026 15:43:37 -0400
Subject: [PATCH] Bumped dependency versions and updated all modules to work
 with Java 25

---
 .../final/unicorn-location-api-final/Dockerfile             | 4 ++--
 labs/unicorn-location-api/graal/Dockerfile                  | 4 ++--
 .../jni-config.json                                         | 2 +-
 .../reflect-config.json                                     | 5 +++--
 labs/unicorn-stock-broker/pom.xml                           | 2 +-
 .../software/alternatives/unicorn-store-micronaut/pom.xml   | 6 +++---
 .../software/alternatives/unicorn-store-quarkus/pom.xml     | 6 +++---
 .../alternatives/unicorn-store-spring-graalvm/Dockerfile    | 4 ++--
 labs/unicorn-store/software/unicorn-store-spring/pom.xml    | 6 +++---
 9 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/labs/unicorn-location-api/final/unicorn-location-api-final/Dockerfile b/labs/unicorn-location-api/final/unicorn-location-api-final/Dockerfile
index 99835307b..d7f82284a 100644
--- a/labs/unicorn-location-api/final/unicorn-location-api-final/Dockerfile
+++ b/labs/unicorn-location-api/final/unicorn-location-api-final/Dockerfile
@@ -8,13 +8,13 @@ RUN yum -y update \
     && rm -rf /var/cache/yum
 
 # Graal VM
-ENV GRAAL_VERSION 21.0.2
+ENV GRAAL_VERSION 25.0.2
 ENV GRAAL_FILENAME graalvm-community-jdk-${GRAAL_VERSION}_linux-x64_bin.tar.gz
 RUN curl -4 -L https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAAL_VERSION}/${GRAAL_FILENAME} | tar -xvz
 RUN mv graalvm-community-openjdk-${GRAAL_VERSION}* /usr/lib/graalvm
 
 # Maven
-ENV MVN_VERSION 3.9.11
+ENV MVN_VERSION 3.9.14
 ENV MVN_FOLDERNAME apache-maven-${MVN_VERSION}
 ENV MVN_FILENAME apache-maven-${MVN_VERSION}-bin.tar.gz
 RUN curl -4 -L https://archive.apache.org/dist/maven/maven-3/${MVN_VERSION}/binaries/${MVN_FILENAME} | tar -xvz
diff --git a/labs/unicorn-location-api/graal/Dockerfile b/labs/unicorn-location-api/graal/Dockerfile
index 9cf1b043b..9f1b6eadc 100644
--- a/labs/unicorn-location-api/graal/Dockerfile
+++ b/labs/unicorn-location-api/graal/Dockerfile
@@ -8,13 +8,13 @@ RUN yum -y update \
     && rm -rf /var/cache/yum
 
 # Graal VM
-ENV GRAAL_VERSION 21.0.2
+ENV GRAAL_VERSION 25.0.2
 ENV GRAAL_FILENAME graalvm-community-jdk-${GRAAL_VERSION}_linux-x64_bin.tar.gz
 RUN curl -4 -L https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAAL_VERSION}/${GRAAL_FILENAME} | tar -xvz
 RUN mv graalvm-community-openjdk-${GRAAL_VERSION}* /usr/lib/graalvm
 
 # Maven
-ENV MVN_VERSION 3.9.11
+ENV MVN_VERSION 3.9.14
 ENV MVN_FOLDERNAME apache-maven-${MVN_VERSION}
 ENV MVN_FILENAME apache-maven-${MVN_VERSION}-bin.tar.gz
 RUN curl -4 -L https://archive.apache.org/dist/maven/maven-3/${MVN_VERSION}/binaries/${MVN_FILENAME} | tar -xvz
diff --git a/labs/unicorn-location-api/graal/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-runtime-interface-client/jni-config.json b/labs/unicorn-location-api/graal/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-runtime-interface-client/jni-config.json
index 83de2b51b..67ad512e3 100644
--- a/labs/unicorn-location-api/graal/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-runtime-interface-client/jni-config.json
+++ b/labs/unicorn-location-api/graal/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-runtime-interface-client/jni-config.json
@@ -5,7 +5,7 @@
   },
   {
     "name":"com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
-    "fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name":"content"}],
+    "fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name":"content"}, {"name":"tenantId"}],
     "allPublicMethods":true
   },
   {
diff --git a/labs/unicorn-location-api/graal/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-runtime-interface-client/reflect-config.json b/labs/unicorn-location-api/graal/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-runtime-interface-client/reflect-config.json
index defdb8bd1..e2345c465 100644
--- a/labs/unicorn-location-api/graal/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-runtime-interface-client/reflect-config.json
+++ b/labs/unicorn-location-api/graal/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-runtime-interface-client/reflect-config.json
@@ -28,7 +28,8 @@
   },
   {
     "name":"com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
-    "fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name":"content"}],
-    "allPublicMethods":true
+    "fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name":"content"}, {"name":"tenantId"}],
+    "allPublicMethods":true,
+    "unsafeAllocated":true
   }
 ]
\ No newline at end of file
diff --git a/labs/unicorn-stock-broker/pom.xml b/labs/unicorn-stock-broker/pom.xml
index 3b7199285..32a9c5012 100644
--- a/labs/unicorn-stock-broker/pom.xml
+++ b/labs/unicorn-stock-broker/pom.xml
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.crac</groupId>
             <artifactId>crac</artifactId>
-            <version>1.4.0</version>
+            <version>1.5.0</version>
         </dependency>
         <dependency>
           <groupId>com.amazonaws</groupId>
diff --git a/labs/unicorn-store/software/alternatives/unicorn-store-micronaut/pom.xml b/labs/unicorn-store/software/alternatives/unicorn-store-micronaut/pom.xml
index 13809a37b..18d90ab7a 100644
--- a/labs/unicorn-store/software/alternatives/unicorn-store-micronaut/pom.xml
+++ b/labs/unicorn-store/software/alternatives/unicorn-store-micronaut/pom.xml
@@ -19,7 +19,7 @@
     <micronaut.aot.enabled>true</micronaut.aot.enabled>
     <micronaut.aot.packageName>com.unicorn.store.aot.generated</micronaut.aot.packageName>
     <micronaut.runtime>lambda</micronaut.runtime>
-    <build.plugins.plugin.version>3.11.0</build.plugins.plugin.version>
+    <build.plugins.plugin.version>3.15.0</build.plugins.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
@@ -29,7 +29,7 @@
       <dependency>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>bom</artifactId>
-        <version>2.42.4</version>
+        <version>2.42.6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
-      <version>3.1.0</version>
+      <version>3.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.postgresql</groupId>
diff --git a/labs/unicorn-store/software/alternatives/unicorn-store-quarkus/pom.xml b/labs/unicorn-store/software/alternatives/unicorn-store-quarkus/pom.xml
index e96ee5642..fdce64243 100644
--- a/labs/unicorn-store/software/alternatives/unicorn-store-quarkus/pom.xml
+++ b/labs/unicorn-store/software/alternatives/unicorn-store-quarkus/pom.xml
@@ -13,7 +13,7 @@
     <maven.compiler.target>25</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <quarkus.platform.version>3.32.1</quarkus.platform.version>
+    <quarkus.platform.version>3.32.2</quarkus.platform.version>
   </properties>
 
   <dependencyManagement>
@@ -21,7 +21,7 @@
       <dependency>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>bom</artifactId>
-        <version>2.42.4</version>
+        <version>2.42.6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.crac</groupId>
       <artifactId>crac</artifactId>
-      <version>1.4.0</version>
+      <version>1.5.0</version>
     </dependency>
   
     <!-- use for REST API Gateway and for LB integration -->
diff --git a/labs/unicorn-store/software/alternatives/unicorn-store-spring-graalvm/Dockerfile b/labs/unicorn-store/software/alternatives/unicorn-store-spring-graalvm/Dockerfile
index 6ace2c52c..159e94ac8 100644
--- a/labs/unicorn-store/software/alternatives/unicorn-store-spring-graalvm/Dockerfile
+++ b/labs/unicorn-store/software/alternatives/unicorn-store-spring-graalvm/Dockerfile
@@ -8,13 +8,13 @@ RUN yum -y update \
     && rm -rf /var/cache/yum
 
 # Graal VM
-ENV GRAAL_VERSION 21.0.2
+ENV GRAAL_VERSION 25.0.2
 ENV GRAAL_FILENAME graalvm-community-jdk-${GRAAL_VERSION}_linux-x64_bin.tar.gz
 RUN curl -4 -L https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAAL_VERSION}/${GRAAL_FILENAME} | tar -xvz
 RUN mv graalvm-community-openjdk-${GRAAL_VERSION}* /usr/lib/graalvm
 
 # Maven
-ENV MVN_VERSION 3.9.9
+ENV MVN_VERSION 3.9.14
 ENV MVN_FOLDERNAME apache-maven-${MVN_VERSION}
 ENV MVN_FILENAME apache-maven-${MVN_VERSION}-bin.tar.gz
 RUN curl -4 -L https://archive.apache.org/dist/maven/maven-3/${MVN_VERSION}/binaries/${MVN_FILENAME} | tar -xvz
diff --git a/labs/unicorn-store/software/unicorn-store-spring/pom.xml b/labs/unicorn-store/software/unicorn-store-spring/pom.xml
index f3d92d003..49a97a2b2 100644
--- a/labs/unicorn-store/software/unicorn-store-spring/pom.xml
+++ b/labs/unicorn-store/software/unicorn-store-spring/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>eventbridge</artifactId>
-            <version>2.42.4</version>
+            <version>2.42.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>software.amazon.awssdk</groupId>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-crt-client</artifactId>
-            <version>2.42.4</version>
+            <version>2.42.6</version>
         </dependency>
         <dependency><!-- required for Spring's ConditionalOnCheckpointRestore to work -->
             <!-- see https://docs.spring.io/spring-framework/reference/integration/checkpoint-restore.html -->
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.0</version>
         </dependency>
 
         <dependency>