From 53bd7a5587489bfc5389df2c3f2e9e7eea509460 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Thu, 23 Jul 2026 16:43:17 -0400
Subject: [PATCH] Update to Java 26

---
 .java-version                                                 | 2 +-
 pom.xml                                                       | 4 ++--
 .../whispersystems/textsecuregcm/grpc/net/SniMapperTest.java  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.java-version b/.java-version
index 7f9309bd6..07a1b9beb 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-temurin-25
+temurin-26
diff --git a/pom.xml b/pom.xml
index da80084bd..3fbd984e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
     <redis.image>redis:7.4-alpine@sha256:6ab0b6e7381779332f97b8ca76193e45b0756f38d4c0dcda72dbb3c32061ab99</redis.image>
     <redis-cluster.image>docker.io/bitnamilegacy/redis-cluster:7.4.3@sha256:a53d023fdfaf8a8d7ddc58da040d3494e4cb45772644618ffa44c42dcd32b9af</redis-cluster.image>
 
-    <docker.image>eclipse-temurin:25-jre-resolute@sha256:71bfb73662d4146bdc9ee2f97418a764d5ab4e83f4e90baec3b3dcda14071007</docker.image>
+    <docker.image>eclipse-temurin:26-jre-resolute@sha256:c3b6e31e48772c98e8868654e5f21fb2c3670e67c055ddd76d8cf37e62113eb5</docker.image>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -532,7 +532,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.15.0</version>
         <configuration>
-          <release>25</release>
+          <release>26</release>
         </configuration>
       </plugin>
 
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/SniMapperTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/SniMapperTest.java
index d421f4af9..2fbf50fe3 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/SniMapperTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/SniMapperTest.java
@@ -145,8 +145,8 @@ class SniMapperTest {
         Arguments.of(FOO_DOMAIN, List.of(), "Ed25519"),
         Arguments.of(BAR_DOMAIN, List.of(), "Ed25519"),
         Arguments.of(BAR_DOMAIN, List.of("ed25519"), "Ed25519"),
-        Arguments.of(FOO_DOMAIN, List.of("rsa_pss_rsae_sha256", "rsa_pss_rsae_sha384", "rsa_pss_rsae_sha512"), "SHA256withRSA"),
-        Arguments.of(FOO_DOMAIN, List.of("rsa_pss_rsae_sha256", "rsa_pss_rsae_sha384", "rsa_pss_rsae_sha512", "ed25519"), "SHA256withRSA"),
+        Arguments.of(FOO_DOMAIN, List.of("rsa_pss_rsae_sha256", "rsa_pss_rsae_sha384", "rsa_pss_rsae_sha512", "rsa_pkcs1_sha256"), "SHA256withRSA"),
+        Arguments.of(FOO_DOMAIN, List.of("rsa_pss_rsae_sha256", "rsa_pss_rsae_sha384", "rsa_pss_rsae_sha512", "rsa_pkcs1_sha256", "ed25519"), "SHA256withRSA"),
         Arguments.of(FOO_DOMAIN, List.of("ed25519", "rsa_pss_rsae_sha256", "rsa_pss_rsae_sha384", "rsa_pss_rsae_sha512"), "Ed25519")
     );
   }