Skip to content

Commit

Permalink
Use and require Java 22
Browse files Browse the repository at this point in the history
  • Loading branch information
oneonestar authored and mosabua committed Sep 3, 2024
1 parent 9c0f53b commit d851e0f
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21.0
22
4 changes: 2 additions & 2 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion gateway-ha/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 6 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit d851e0f

Please sign in to comment.