Skip to content

Commit ff2b375

Browse files
committed
Upgrade to Trino 476
1 parent b0a84fb commit ff2b375

File tree

11 files changed

+63
-27
lines changed

11 files changed

+63
-27
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
java-version: [23]
25+
java-version: [24]
2626
timeout-minutes: 20
2727
steps:
2828
- name: Checkout source

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# under the License.
1717
wrapperVersion=3.3.2
1818
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip

README.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,29 @@ customizations.
2525
Find more [information about building and using the custom tarball package in
2626
the documentation](trino-server-custom/README.md).
2727

28+
## Build
29+
30+
You can build the project with the modules `trino-server-custom` and
31+
`trino-server-rpm` with the following commands:
32+
33+
```shell
34+
cd trino-packages
35+
./mvnw clean install
36+
```
37+
38+
Including all tests:
39+
40+
```shell
41+
./mvnw -P ci clean install
42+
```
43+
44+
More details in the specific module
45+
[trino-server-custom](trino-server-custom/README.md) and the
46+
[trino-server-rpm](trino-server-rpm/README.md) README files.
47+
48+
Building the custom Docker image is separate and documented in the
49+
[custom-docker](custom-docker/README.md) README file.
50+
2851
## Potential future additions
2952

3053
The following other package ideas are suitable for implementation in this

custom-docker/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ limited subset of plugins to create a image with the following characteristics:
4444
* `geospatial` functions plugin removed.
4545
* `exchange-filesystem` plugin removed.
4646

47-
The project is configured for Trino 475.
47+
The project is configured for Trino 476.
4848

4949
## Building
5050

@@ -73,9 +73,9 @@ processor architectures locally with `docker images`:
7373

7474
```
7575
REPOSITORY TAG IMAGE ID CREATED SIZE
76-
trino-custom 475-ppc64le 2279b0a14cb6 About a minute ago 790MB
77-
trino-custom 475-arm64 67a3dcee3c85 About a minute ago 765MB
78-
trino-custom 475-amd64 df994bb44819 About a minute ago 757MB
76+
trino-custom 476-ppc64le 2279b0a14cb6 About a minute ago 790MB
77+
trino-custom 476-arm64 67a3dcee3c85 About a minute ago 765MB
78+
trino-custom 476-amd64 df994bb44819 About a minute ago 757MB
7979
```
8080

8181
The specific version depends on the parameter `TRINO_VERSION` set in `build.sh`.
@@ -92,7 +92,7 @@ purposes. The Trino node functions both as a coordinator and a worker. To launch
9292
it, execute the following:
9393

9494
```shell
95-
docker run -p 8080:8080 --name trino-custom trino-custom:475-arm64
95+
docker run -p 8080:8080 --name trino-custom trino-custom:476-arm64
9696
```
9797

9898
Wait for the following message log line:
@@ -155,7 +155,7 @@ other Trino documentation for more details.
155155

156156
## Updating to other Trino version
157157

158-
The project is configured to build a custom tarball for Trino 475. Updates to
158+
The project is configured to build a custom tarball for Trino 476. Updates to
159159
newer versions can be contributed to the repository or can be done locally. The
160160
following steps are necessary:
161161

custom-docker/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ Builds the Trino Docker image
99
1010
-h Display help
1111
-a Build the specified comma-separated architectures, defaults to amd64,arm64,ppc64le
12-
-r Trino version, defaults to 475
12+
-r Trino version, defaults to 476
1313
-t Image tag name, defaults to trino-custom
1414
EOF
1515
}
1616

1717
ARCHITECTURES=(amd64 arm64 ppc64le)
1818
# Set the desires Trino version. This version is also used automatically in the
1919
# Dockerfile.
20-
TRINO_VERSION=475
20+
TRINO_VERSION=476
2121
TAG_PREFIX=trino-custom
2222

2323
while getopts ":a:r:t:h" o; do

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.airlift</groupId>
77
<artifactId>airbase</artifactId>
8-
<version>253</version>
8+
<version>264</version>
99
</parent>
1010

1111
<groupId>io.trino</groupId>

trino-server-custom/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ characteristics:
4949
* `ml` functions plugin from `trino-server-core` removed.
5050
* `geospatial` functions plugin from `trino-server-core` removed.
5151

52-
The project is configured for Trino 475.
52+
The project is configured for Trino 476.
5353

5454
## Building
5555

5656
The build requirements for the project are identical to Trino build
5757
requirements:
5858

5959
* Linux or MacOS
60-
* Java 23
60+
* Java 24
6161

6262
Download and extract or clone the repository to work with the `trino-packages`
6363
directory locally on your machine.
@@ -84,7 +84,8 @@ After a successful build, you find the tarball in the
8484
Build the project on any machine, and copy the tarball package from the
8585
`trino-server-custom/target` directory to the server on which you want to
8686
install Trino. The server must meet the Trino requirements for the specific
87-
Trino version, for example Java 23 for Trino 472.
87+
Trino version, for example Java 23 for Trino 472, or Java 24 for Trino 476 and
88+
higher.
8889

8990
Find details in the [Trino documentation](https://trino.io/docs/current/installation/deployment.html)
9091

trino-server-custom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<description>Trino - Server custom tarball package</description>
1414

1515
<properties>
16-
<dep.trino.version>475</dep.trino.version>
16+
<dep.trino.version>476</dep.trino.version>
1717
<dep.takari.version>2.2.0</dep.takari.version>
1818
<air.check.skip-checkstyle>true</air.check.skip-checkstyle>
1919
<air.check.skip-enforcer>false</air.check.skip-enforcer>

trino-server-rpm/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ The RPM archive contains the application, all plugins, the necessary default
2121
configuration files, default setups, and integration with the operating system
2222
to start as a service.
2323

24-
The project is configured for Trino 475.
24+
The project is configured for Trino 476.
2525

2626
## Building
2727

2828
The build requirements for the project are identical to Trino build requirements:
2929

3030
* Linux or MacOS
31-
* Java 23
31+
* Java 24
3232

3333
Download and extract or clone the repository to work with the `trino-packages`
3434
directory locally on your machine.

trino-server-rpm/pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<url>https://trino.io</url>
1515

1616
<properties>
17-
<project.build.targetJdk>23</project.build.targetJdk>
18-
<air.java.version>23.0.0</air.java.version>
17+
<project.build.targetJdk>24</project.build.targetJdk>
18+
<air.java.version>24.0.1</air.java.version>
1919
<air.check.skip-spotbugs>true</air.check.skip-spotbugs>
2020
<air.check.skip-pmd>true</air.check.skip-pmd>
2121
<air.check.skip-jacoco>true</air.check.skip-jacoco>
2222
<air.check.skip-duplicate-finder>true</air.check.skip-duplicate-finder>
2323
<air.modernizer.java-version>8</air.modernizer.java-version>
2424

25-
<dep.trino.version>475</dep.trino.version>
25+
<dep.trino.version>476</dep.trino.version>
2626
<server.tar.package>trino-server-${dep.trino.version}</server.tar.package>
2727
<rpm.skipSigning>true</rpm.skipSigning>
2828
</properties>
@@ -111,7 +111,7 @@
111111
<dependency>
112112
<groupId>org.testcontainers</groupId>
113113
<artifactId>testcontainers</artifactId>
114-
<version>1.20.6</version>
114+
<version>1.21.3</version>
115115
<scope>test</scope>
116116
</dependency>
117117
</dependencies>
@@ -403,6 +403,7 @@
403403
<plugin>
404404
<groupId>org.apache.maven.plugins</groupId>
405405
<artifactId>maven-failsafe-plugin</artifactId>
406+
<version>${dep.plugin.surefire.version}</version>
406407
<configuration>
407408
<systemPropertyVariables>
408409
<rpm>${project.build.directory}/trino-server-rpm-${dep.trino.version}.noarch.rpm</rpm>

0 commit comments

Comments
 (0)