diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e9bf92e9b..54a7a31b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,8 +22,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        java-version: [21, 22]
+        java-version: [22, 23-ea]
     timeout-minutes: 20
     steps:
       - name: Checkout source
diff --git a/.java-version b/.java-version
index 5f39e9144..2bd5a0a98 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-21.0
+22
diff --git a/docs/development.md b/docs/development.md
index c03f139de..f29851952 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -3,7 +3,7 @@
 ## Build requirements
 
 * Mac OS X or Linux
-* Java 21+, 64-bit
+* Java 22+, 64-bit
 * Docker
 
 #### Running Trino Gateway in your IDE
@@ -21,7 +21,7 @@ or execute the following command:
 
 #### Locally
 
-This project requires Java 21. Note that higher version of Java have not been
+This project requires Java 22. 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 71b7eaba1..b45f05d9e 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -16,7 +16,7 @@ Consider the following requirements for your Trino Gateway installation.
 
 ### Java
 
-Trino Gateway requires a Java 21 runtime. Older versions of Java can not be
+Trino Gateway requires a Java 22 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/gateway-ha/pom.xml b/gateway-ha/pom.xml
index 69f21569b..902aab66e 100644
--- a/gateway-ha/pom.xml
+++ b/gateway-ha/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_annotations</artifactId>
-            <optional>true</optional>
+            <version>${dep.errorprone.version}</version>
         </dependency>
 
         <dependency>
diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/router/TrinoQueryProperties.java b/gateway-ha/src/main/java/io/trino/gateway/ha/router/TrinoQueryProperties.java
index ad6cc9808..506acf706 100644
--- a/gateway-ha/src/main/java/io/trino/gateway/ha/router/TrinoQueryProperties.java
+++ b/gateway-ha/src/main/java/io/trino/gateway/ha/router/TrinoQueryProperties.java
@@ -41,6 +41,7 @@
 import io.trino.sql.tree.Execute;
 import io.trino.sql.tree.Identifier;
 import io.trino.sql.tree.Node;
+import io.trino.sql.tree.NodeLocation;
 import io.trino.sql.tree.QualifiedName;
 import io.trino.sql.tree.RenameMaterializedView;
 import io.trino.sql.tree.RenameSchema;
@@ -434,7 +435,7 @@ private QualifiedName parseIdentifierStringToQualifiedName(String name)
                 if (!inQuotes) {
                     if (i != start) {
                         log.error("Illegal position for first quote character in table name: %s", name);
-                        throw new ParsingException(format("Illegal position for first quote character in table name: %s", name));
+                        throw new ParsingException(format("Illegal position for first quote character in table name: %s", name), new NodeLocation(1, i));
                     }
                     start = start + 1;
                     partQuoted = true;
diff --git a/pom.xml b/pom.xml
index 8080f2cd2..2a86cdba5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,11 +39,15 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <project.build.targetJdk>21</project.build.targetJdk>
-        <air.java.version>21</air.java.version>
+        <project.build.targetJdk>22</project.build.targetJdk>
+        <air.java.version>22</air.java.version>
         <air.check.skip-spotbugs>true</air.check.skip-spotbugs>
         <air.check.skip-pmd>true</air.check.skip-pmd>
         <air.release.preparation-goals>clean verify -DskipTests</air.release.preparation-goals>
+
+        <!-- Dependency versions, keep sorted -->
+        <dep.errorprone.version>2.29.2</dep.errorprone.version>
+        <dep.trino.version>454</dep.trino.version>
     </properties>
 
     <dependencyManagement>