From 170e1de0f95497eea7528ebe8476ef593cc65359 Mon Sep 17 00:00:00 2001
From: Manfred Moser <manfred@simpligility.ca>
Date: Fri, 28 Nov 2025 17:17:30 -0800
Subject: [PATCH 1/4] Update to use and require Java 25

---
 .github/workflows/ci.yml | 2 +-
 .java-version            | 2 +-
 docs/development.md      | 4 ++--
 docs/installation.md     | 2 +-
 pom.xml                  | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce7183565..87dbbf51a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [24]
+        java-version: [25]
     timeout-minutes: 20
     steps:
       - name: Checkout source
diff --git a/.java-version b/.java-version
index eae980b3c..7273c0fa8 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-24.0.2+12
+25
diff --git a/docs/development.md b/docs/development.md
index 1d2f0fa8a..2835a7dd1 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -3,7 +3,7 @@
 ## Build requirements
 
 * Mac OS X or Linux
-* Java 24+, 64-bit
+* Java 25+, 64-bit
 * Docker
 
 #### Running Trino Gateway in your IDE
@@ -21,7 +21,7 @@ or execute the following command:
 
 #### Locally
 
-This project requires Java 24. Note that higher version of Java have not been
+This project requires Java 25. Note that higher version of Java have not been
 verified and may run into unexpected issues.
 
 Run `./mvnw clean install` to build `trino-gateway`. VM options required for
diff --git a/docs/installation.md b/docs/installation.md
index a00034ad3..b8995a159 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -21,7 +21,7 @@ Consider the following requirements for your Trino Gateway installation.
 
 ### Java
 
-Trino Gateway requires a Java 24 runtime. Older versions of Java can not be
+Trino Gateway requires a Java 25 runtime. Older versions of Java can not be
 used. Newer versions might work but are not tested.
 
 Verify the Java version on your system with `java -version`.
diff --git a/pom.xml b/pom.xml
index a5d5452e6..e37b079fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,8 +39,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <project.build.targetJdk>24</project.build.targetJdk>
-        <air.java.version>24.0.2</air.java.version>
+        <project.build.targetJdk>25</project.build.targetJdk>
+        <air.java.version>25.0.0</air.java.version>
         <air.check.skip-spotbugs>true</air.check.skip-spotbugs>
         <air.check.skip-pmd>true</air.check.skip-pmd>
         <air.modernizer.java-version>8</air.modernizer.java-version>

From cfc060977e562b1a46617465f01c47f475c2bc2a Mon Sep 17 00:00:00 2001
From: Manfred Moser <manfred@simpligility.ca>
Date: Fri, 28 Nov 2025 17:18:00 -0800
Subject: [PATCH 2/4] Update to Jetty 12.1.4

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e37b079fc..3771e1dba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <air.modernizer.java-version>8</air.modernizer.java-version>
         <air.release.preparation-goals>clean verify -DskipTests</air.release.preparation-goals>
 
-        <dep.jetty.version>12.1.3</dep.jetty.version>
+        <dep.jetty.version>12.1.4</dep.jetty.version>
     </properties>
 
     <dependencyManagement>

From 96a33aa4c8800bb0d2e732a3bd950bc352d199eb Mon Sep 17 00:00:00 2001
From: Manfred Moser <manfred@simpligility.ca>
Date: Fri, 28 Nov 2025 17:39:02 -0800
Subject: [PATCH 3/4] Update airbase, airlift and related deps

- airbase to 330
- airlift to 381i
- jersey to 4.0.0
- okhttp to 5.3.2
---
 gateway-ha/pom.xml | 2 +-
 pom.xml            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gateway-ha/pom.xml b/gateway-ha/pom.xml
index a4d16fd9b..36b46ef50 100644
--- a/gateway-ha/pom.xml
+++ b/gateway-ha/pom.xml
@@ -25,7 +25,7 @@
         <dep.flyway.version>11.8.2</dep.flyway.version>
         <dep.jeasy.version>4.1.0</dep.jeasy.version>
         <dep.mockito.version>5.18.0</dep.mockito.version>
-        <dep.okhttp3.version>5.3.0</dep.okhttp3.version>
+        <dep.okhttp3.version>5.3.2</dep.okhttp3.version>
         <dep.trino.version>474</dep.trino.version>
     </properties>
 
diff --git a/pom.xml b/pom.xml
index 3771e1dba..9e3ceabed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>325</version>
+        <version>330</version>
     </parent>
 
     <groupId>io.trino.gateway</groupId>
@@ -54,7 +54,7 @@
             <dependency>
                 <groupId>io.airlift</groupId>
                 <artifactId>bom</artifactId>
-                <version>372</version>
+                <version>381</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -96,7 +96,7 @@
             <dependency>
                 <groupId>org.glassfish.jersey.core</groupId>
                 <artifactId>jersey-server</artifactId>
-                <version>3.1.11</version>
+                <version>4.0.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

From 04df2f6add247aca251dc9e7caeeb0441ae5b231 Mon Sep 17 00:00:00 2001
From: Manfred Moser <manfred@simpligility.ca>
Date: Fri, 28 Nov 2025 21:25:34 -0800
Subject: [PATCH 4/4] Adjust container images and build

---
 .java-version   | 2 +-
 docker/build.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.java-version b/.java-version
index 7273c0fa8..f1a2f699c 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-25
+25.0.1+8
diff --git a/docker/build.sh b/docker/build.sh
index e1d899855..4e751c883 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -107,8 +107,8 @@ TAG_PREFIX="trino-gateway:${TRINO_GATEWAY_VERSION}"
 #version file is used by the Helm chart test
 echo "${TRINO_GATEWAY_VERSION}" > "${SOURCE_DIR}"/trino-gateway-version.txt
 
-TRINO_GATEWAY_BASE_IMAGE=${TRINO_GATEWAY_BASE_IMAGE:-'registry.access.redhat.com/ubi10/ubi-micro:latest'}
-TRINO_GATEWAY_BUILD_IMAGE=${TRINO_GATEWAY_BUILD_IMAGE:-'registry.access.redhat.com/ubi10/ubi:latest'}
+TRINO_GATEWAY_BASE_IMAGE=${TRINO_GATEWAY_BASE_IMAGE:-'redhat/ubi10-micro:latest'}
+TRINO_GATEWAY_BUILD_IMAGE=${TRINO_GATEWAY_BUILD_IMAGE:-'redhat/ubi10:latest'}
 
 for arch in "${ARCHITECTURES[@]}"; do
     echo "🫙  Building the image for $arch with Temurin JDK release ${JDK_RELEASE_NAME}"