Skip to content

Commit b4fb40d

Browse files
authored
Merge pull request #1484 from aws-samples/java25
Bumped dependency versions and updated all modules to work with Java 25
2 parents e142afe + d256ee1 commit b4fb40d

File tree

9 files changed

+15
-14
lines changed

9 files changed

+15
-14
lines changed

labs/unicorn-location-api/final/unicorn-location-api-final/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ RUN yum -y update \
88
&& rm -rf /var/cache/yum
99

1010
# Graal VM
11-
ENV GRAAL_VERSION 21.0.2
11+
ENV GRAAL_VERSION 25.0.2
1212
ENV GRAAL_FILENAME graalvm-community-jdk-${GRAAL_VERSION}_linux-x64_bin.tar.gz
1313
RUN curl -4 -L https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAAL_VERSION}/${GRAAL_FILENAME} | tar -xvz
1414
RUN mv graalvm-community-openjdk-${GRAAL_VERSION}* /usr/lib/graalvm
1515

1616
# Maven
17-
ENV MVN_VERSION 3.9.11
17+
ENV MVN_VERSION 3.9.14
1818
ENV MVN_FOLDERNAME apache-maven-${MVN_VERSION}
1919
ENV MVN_FILENAME apache-maven-${MVN_VERSION}-bin.tar.gz
2020
RUN curl -4 -L https://archive.apache.org/dist/maven/maven-3/${MVN_VERSION}/binaries/${MVN_FILENAME} | tar -xvz

labs/unicorn-location-api/graal/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ RUN yum -y update \
88
&& rm -rf /var/cache/yum
99

1010
# Graal VM
11-
ENV GRAAL_VERSION 21.0.2
11+
ENV GRAAL_VERSION 25.0.2
1212
ENV GRAAL_FILENAME graalvm-community-jdk-${GRAAL_VERSION}_linux-x64_bin.tar.gz
1313
RUN curl -4 -L https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAAL_VERSION}/${GRAAL_FILENAME} | tar -xvz
1414
RUN mv graalvm-community-openjdk-${GRAAL_VERSION}* /usr/lib/graalvm
1515

1616
# Maven
17-
ENV MVN_VERSION 3.9.11
17+
ENV MVN_VERSION 3.9.14
1818
ENV MVN_FOLDERNAME apache-maven-${MVN_VERSION}
1919
ENV MVN_FILENAME apache-maven-${MVN_VERSION}-bin.tar.gz
2020
RUN curl -4 -L https://archive.apache.org/dist/maven/maven-3/${MVN_VERSION}/binaries/${MVN_FILENAME} | tar -xvz

labs/unicorn-location-api/graal/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-runtime-interface-client/jni-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
},
66
{
77
"name":"com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
8-
"fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name":"content"}],
8+
"fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name":"content"}, {"name":"tenantId"}],
99
"allPublicMethods":true
1010
},
1111
{

labs/unicorn-location-api/graal/resources/META-INF/native-image/com.amazonaws/aws-lambda-java-runtime-interface-client/reflect-config.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
},
2929
{
3030
"name":"com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
31-
"fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name":"content"}],
32-
"allPublicMethods":true
31+
"fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name":"content"}, {"name":"tenantId"}],
32+
"allPublicMethods":true,
33+
"unsafeAllocated":true
3334
}
3435
]

labs/unicorn-stock-broker/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<dependency>
8484
<groupId>org.crac</groupId>
8585
<artifactId>crac</artifactId>
86-
<version>1.4.0</version>
86+
<version>1.5.0</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>com.amazonaws</groupId>

labs/unicorn-store/software/alternatives/unicorn-store-micronaut/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<micronaut.aot.enabled>true</micronaut.aot.enabled>
2020
<micronaut.aot.packageName>com.unicorn.store.aot.generated</micronaut.aot.packageName>
2121
<micronaut.runtime>lambda</micronaut.runtime>
22-
<build.plugins.plugin.version>3.11.0</build.plugins.plugin.version>
22+
<build.plugins.plugin.version>3.15.0</build.plugins.plugin.version>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2525
</properties>
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>jakarta.persistence</groupId>
9292
<artifactId>jakarta.persistence-api</artifactId>
93-
<version>3.1.0</version>
93+
<version>3.2.0</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.postgresql</groupId>

labs/unicorn-store/software/alternatives/unicorn-store-quarkus/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>org.crac</groupId>
7474
<artifactId>crac</artifactId>
75-
<version>1.4.0</version>
75+
<version>1.5.0</version>
7676
</dependency>
7777

7878
<!-- use for REST API Gateway and for LB integration -->

labs/unicorn-store/software/alternatives/unicorn-store-spring-graalvm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ RUN yum -y update \
88
&& rm -rf /var/cache/yum
99

1010
# Graal VM
11-
ENV GRAAL_VERSION 21.0.2
11+
ENV GRAAL_VERSION 25.0.2
1212
ENV GRAAL_FILENAME graalvm-community-jdk-${GRAAL_VERSION}_linux-x64_bin.tar.gz
1313
RUN curl -4 -L https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAAL_VERSION}/${GRAAL_FILENAME} | tar -xvz
1414
RUN mv graalvm-community-openjdk-${GRAAL_VERSION}* /usr/lib/graalvm
1515

1616
# Maven
17-
ENV MVN_VERSION 3.9.9
17+
ENV MVN_VERSION 3.9.14
1818
ENV MVN_FOLDERNAME apache-maven-${MVN_VERSION}
1919
ENV MVN_FILENAME apache-maven-${MVN_VERSION}-bin.tar.gz
2020
RUN curl -4 -L https://archive.apache.org/dist/maven/maven-3/${MVN_VERSION}/binaries/${MVN_FILENAME} | tar -xvz

labs/unicorn-store/software/unicorn-store-spring/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>jakarta.persistence</groupId>
7070
<artifactId>jakarta.persistence-api</artifactId>
71-
<version>3.1.0</version>
71+
<version>3.2.0</version>
7272
</dependency>
7373

7474
<dependency>

0 commit comments

Comments
 (0)