Skip to content

Commit ffcb7ad

Browse files
nineinchnicknineinchnick
committed
Update dependencies
1 parent 37b64da commit ffcb7ad

File tree

10 files changed

+118
-67
lines changed

10 files changed

+118
-67
lines changed

‎.github/workflows/maven.yaml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- name: Set up the JDK
16-
uses: actions/setup-java@v4
16+
uses: actions/setup-java@v5
1717
with:
1818
java-version: '24'
1919
distribution: 'temurin'
@@ -23,12 +23,27 @@ jobs:
2323
run: |
2424
echo "::add-matcher::.github/problem-matcher.json"
2525
echo "::remove-matcher owner=java::"
26+
27+
- name: Get Trino version
28+
id: trino_tag
29+
run: |
30+
trino_tag=$(./mvnw -B help:evaluate -Dexpression=dep.trino.version -q -DforceStdout)
31+
echo "trino_tag=$trino_tag" >> $GITHUB_OUTPUT
32+
- uses: actions/checkout@v5
33+
with:
34+
repository: trinodb/trino
35+
path: trino
36+
ref: ${{ steps.trino_tag.outputs.trino_tag }}
37+
- name: Build Trino
38+
run: cd trino && ./mvnw -B install -DskipTests -Dair.check.skip-all -Dskip.npm -pl ':trino-main,:trino-testing,:trino-memory,:trino-tpch' -am
39+
2640
- name: Build with Maven
2741
env:
2842
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
2943
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
3044
AWS_REGION: eu-central-1
3145
run: ./mvnw -B package
46+
3247
- name: Annotate run
3348
uses: trinodb/github-actions/action-surefire-report@b63800bedfbc7ab1ff2e5fe7eaecf5ab82ce6a70
3449
if: always()

‎.github/workflows/release.yaml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,44 @@ jobs:
1212
contents: write
1313
packages: write
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
1717
fetch-depth: 0
18-
19-
- name: Set up the JDK
20-
uses: actions/setup-java@v4
18+
- uses: actions/setup-java@v5
2119
with:
2220
java-version: '24'
2321
distribution: 'temurin'
2422
cache: 'maven'
25-
2623
- name: Configure Problem Matchers
2724
run: |
2825
echo "::add-matcher::.github/problem-matcher.json"
2926
echo "::remove-matcher owner=java::"
30-
3127
- name: Configure Git user
3228
run: |
3329
git config user.name "${{ github.event.head_commit.committer.name }}"
3430
git config user.email "${{ github.event.head_commit.committer.email }}"
3531
3632
- name: Set up Docker Buildx
3733
uses: docker/setup-buildx-action@v3
38-
3934
- name: Login to Docker Hub
4035
uses: docker/login-action@v3
4136
with:
4237
username: ${{ secrets.DOCKERHUB_USERNAME }}
4338
password: ${{ secrets.DOCKERHUB_TOKEN }}
4439

40+
- name: Get Trino version
41+
id: trino_tag
42+
run: |
43+
trino_tag=$(./mvnw -B help:evaluate -Dexpression=dep.trino.version -q -DforceStdout)
44+
echo "trino_tag=$trino_tag" >> $GITHUB_OUTPUT
45+
- uses: actions/checkout@v5
46+
with:
47+
repository: trinodb/trino
48+
path: trino
49+
ref: ${{ steps.trino_tag.outputs.trino_tag }}
50+
- name: Build Trino
51+
run: cd trino && ./mvnw -B install -DskipTests -Dair.check.skip-all -Dskip.npm -pl ':trino-main,:trino-testing,:trino-memory,:trino-tpch' -am
52+
4553
- name: Prepare release
4654
run: ./mvnw -B release:prepare
4755
env:

‎.mvn/extensions.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<extensions>
3+
<extension>
4+
<groupId>io.takari.maven</groupId>
5+
<artifactId>takari-smart-builder</artifactId>
6+
<version>1.1.0</version>
7+
</extension>
8+
</extensions>

‎.mvn/jvm.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
1010
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
1111
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
12+
--enable-native-access=ALL-UNNAMED

‎.mvn/maven.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--strict-checksums
2+
-b
3+
smart
4+
-T2C

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
wrapperVersion=3.3.2
1+
wrapperVersion=3.3.4
182
distributionType=only-script
193
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip

‎mvnw‎

Lines changed: 43 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml‎

Lines changed: 24 additions & 22 deletions
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>264</version>
8+
<version>306</version>
99
</parent>
1010

1111
<groupId>pl.net.was</groupId>
@@ -50,29 +50,37 @@
5050
<air.check.skip-checkstyle>false</air.check.skip-checkstyle>
5151
<air.build.jvmsize>4g</air.build.jvmsize>
5252

53-
<dep.trino.version>476</dep.trino.version>
54-
<dep.airlift.version>336</dep.airlift.version>
55-
<dep.slice.version>2.3</dep.slice.version>
56-
<dep.opentelemetry.version>1.50.0</dep.opentelemetry.version>
57-
<dep.opentelemetry-instrumentation.version>2.16.0</dep.opentelemetry-instrumentation.version>
53+
<dep.trino.version>477</dep.trino.version>
54+
<dep.airlift.version>361</dep.airlift.version>
55+
<dep.slice.version>2.4</dep.slice.version>
56+
<dep.opentelemetry.version>1.54.1</dep.opentelemetry.version>
57+
<dep.opentelemetry-instrumentation.version>2.20.1</dep.opentelemetry-instrumentation.version>
5858
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
59-
<dep.guava.version>33.4.8-jre</dep.guava.version>
59+
<dep.guava.version>33.5.0-jre</dep.guava.version>
6060
<dep.guice.version>7.0.0</dep.guice.version>
61-
<dep.errorprone.version>2.38.0</dep.errorprone.version>
62-
<dep.jackson.version>2.19.0</dep.jackson.version>
61+
<dep.errorprone.version>2.42.0</dep.errorprone.version>
62+
<dep.jackson-annotations.version>2.20</dep.jackson-annotations.version>
63+
<dep.jackson.version>2.20.0</dep.jackson.version>
6364
<dep.joda.version>2.14.0</dep.joda.version>
64-
<dep.junit.version>5.13.0</dep.junit.version>
65+
<dep.junit.version>5.13.4</dep.junit.version>
6566
<dep.slf4j.version>2.0.17</dep.slf4j.version>
66-
<dep.assertj-core.version>3.27.3</dep.assertj-core.version>
67+
<dep.assertj-core.version>3.27.6</dep.assertj-core.version>
6768
<dep.logback.version>1.5.18</dep.logback.version>
6869
<dep.plugin.surefire.version>3.2.5</dep.plugin.surefire.version>
69-
<dep.jna.version>5.17.0</dep.jna.version>
70+
<dep.jna.version>5.18.0</dep.jna.version>
7071

7172
<project.scm.id>github</project.scm.id>
7273
</properties>
7374

7475
<dependencyManagement>
7576
<dependencies>
77+
<dependency>
78+
<groupId>com.squareup.okhttp3</groupId>
79+
<artifactId>okhttp-bom</artifactId>
80+
<version>5.1.0</version>
81+
<type>pom</type>
82+
<scope>import</scope>
83+
</dependency>
7684
<dependency>
7785
<groupId>io.opentelemetry</groupId>
7886
<artifactId>opentelemetry-bom</artifactId>
@@ -121,12 +129,6 @@
121129
<version>${dep.guava.version}</version>
122130
</dependency>
123131

124-
<dependency>
125-
<groupId>io.trino</groupId>
126-
<artifactId>trino-main</artifactId>
127-
<version>${dep.trino.version}</version>
128-
</dependency>
129-
130132
<dependency>
131133
<groupId>jakarta.inject</groupId>
132134
<artifactId>jakarta.inject-api</artifactId>
@@ -135,7 +137,7 @@
135137
<dependency>
136138
<groupId>com.fasterxml.jackson.core</groupId>
137139
<artifactId>jackson-annotations</artifactId>
138-
<version>${dep.jackson.version}</version>
140+
<version>${dep.jackson-annotations.version}</version>
139141
<scope>provided</scope>
140142
</dependency>
141143

@@ -192,7 +194,7 @@
192194
<plugin>
193195
<groupId>org.apache.maven.plugins</groupId>
194196
<artifactId>maven-shade-plugin</artifactId>
195-
<version>3.6.0</version>
197+
<version>3.6.1</version>
196198
</plugin>
197199
<plugin>
198200
<groupId>ca.vanzyl.provisio.maven.plugins</groupId>
@@ -222,7 +224,7 @@
222224
<plugin>
223225
<groupId>org.apache.maven.plugins</groupId>
224226
<artifactId>maven-scm-plugin</artifactId>
225-
<version>2.1.0</version>
227+
<version>2.2.1</version>
226228
<configuration>
227229
<pushChanges>true</pushChanges>
228230
</configuration>
@@ -248,7 +250,7 @@
248250
<plugin>
249251
<groupId>org.apache.maven.plugins</groupId>
250252
<artifactId>maven-wrapper-plugin</artifactId>
251-
<version>3.3.2</version>
253+
<version>3.3.4</version>
252254
</plugin>
253255

254256
<plugin>

‎trino-cloud-aws/pom.xml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>bom</artifactId>
25-
<version>2.31.58</version>
25+
<version>2.34.5</version>
2626
<type>pom</type>
2727
<scope>import</scope>
2828
</dependency>
@@ -40,6 +40,7 @@
4040
<dependency>
4141
<groupId>com.google.inject</groupId>
4242
<artifactId>guice</artifactId>
43+
<classifier>classes</classifier>
4344
</dependency>
4445

4546
<dependency>
@@ -139,14 +140,6 @@
139140
<groupId>io.trino</groupId>
140141
<artifactId>trino-main</artifactId>
141142
<version>${dep.trino.version}</version>
142-
<scope>runtime</scope>
143-
</dependency>
144-
145-
<dependency>
146-
<groupId>io.trino</groupId>
147-
<artifactId>trino-main</artifactId>
148-
<version>${dep.trino.version}</version>
149-
<type>test-jar</type>
150143
<scope>test</scope>
151144
</dependency>
152145

‎trino-cloud-aws/src/test/java/pl/net/was/cloud/aws/TestAwsQueries.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public void showTables()
4141
@Test
4242
public void selectFromTable()
4343
{
44-
assertQuery("SELECT instance_type FROM aws.ec2.instances WHERE instance_id = 'i-0f27b910fbfcd2fb2'",
45-
"VALUES ('t2.micro')");
46-
assertQuery("SELECT creation_date FROM aws.s3.buckets WHERE name = 'jwas'",
44+
assertQuery("SELECT instance_type FROM aws.ec2.instances WHERE instance_id = 'i-076720e508bb0f22b'",
45+
"VALUES ('t3.micro')");
46+
assertQuery("SELECT creation_date FROM aws.s3.buckets WHERE name = 'jan.was'",
4747
"VALUES ('2024-11-13T07:51:56')");
4848
}
4949
}

0 commit comments

Comments
 (0)