From 1e2033984ca4a5998312ffe120542f4e3bbf68bd Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 14:51:06 +0200 Subject: [PATCH 01/17] Update to airbase 147 --- pom.xml | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index b54b41e0ab807..6987d191f63bb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.airlift airbase - 146 + 147 io.trino @@ -183,7 +183,6 @@ 9.22.2 1.13.1 4.13.1 - 1.4.8 86 @@ -2096,31 +2095,6 @@ - - com.github.ekryd.sortpom - sortpom-maven-plugin - 3.2.1 - - false - 4 - true - scope,groupId,artifactId - groupId,artifactId - true - false - Strict - Stop - - - - - verify - - validate - - - - org.apache.maven.plugins maven-enforcer-plugin From 8e9a18280af1ba5325f01eca34c7173804b98277 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 14:53:37 +0200 Subject: [PATCH 02/17] Pin ASM in plugin dependencies to 9.6 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6987d191f63bb..0e9f43df45dc2 100644 --- a/pom.xml +++ b/pom.xml @@ -183,6 +183,7 @@ 9.22.2 1.13.1 4.13.1 + 9.6 86 @@ -258,7 +259,7 @@ org.ow2.asm asm-bom - 9.6 + ${dep.asm.version} pom import From 0e5b1770b6916bd05cff0e9a2d791af28716b3e4 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 14:53:56 +0200 Subject: [PATCH 03/17] Update testcontainers to 1.19.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e9f43df45dc2..0ddec9ff81643 100644 --- a/pom.xml +++ b/pom.xml @@ -168,7 +168,7 @@ 2.2.8 2.22.0 - 1.19.0 + 1.19.1 1.0.8 7.3.1 3.3.2 From 6624afe758f0b381eda7a29932edd13df1624996 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:01:55 +0200 Subject: [PATCH 04/17] Update BQ libraries to 26.23.0 --- plugin/trino-bigquery/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/trino-bigquery/pom.xml b/plugin/trino-bigquery/pom.xml index 2a7a469ce8743..28030e5de1eed 100644 --- a/plugin/trino-bigquery/pom.xml +++ b/plugin/trino-bigquery/pom.xml @@ -22,7 +22,7 @@ com.google.cloud libraries-bom - 26.18.0 + 26.23.0 pom import From 61d0fc39c4953e42708e9bfe641c9cae132166a3 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:02:18 +0200 Subject: [PATCH 05/17] Update JDBI to 3.41.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0ddec9ff81643..a9281de3ec76a 100644 --- a/pom.xml +++ b/pom.xml @@ -251,7 +251,7 @@ org.jdbi jdbi3-bom - 3.41.2 + 3.41.3 pom import From afb7d905c4641b90c65753ca626bcd81c2aa40fd Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:03:04 +0200 Subject: [PATCH 06/17] Update AWS SDK v2 to 2.20.158 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a9281de3ec76a..40705efd826bd 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ ${dep.airlift.version} 2.1.1 1.12.560 - 2.20.157 + 2.20.158 0.11.5 21.9.0.0 1.21 From d9132aca7acaa967a91e265989641c3bd448ee3b Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:03:56 +0200 Subject: [PATCH 07/17] Update AWS SDK v1 to 1.12.561 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40705efd826bd..aa1e6c5daeb9a 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ 1.11.3 ${dep.airlift.version} 2.1.1 - 1.12.560 + 1.12.561 2.20.158 0.11.5 21.9.0.0 From d9e841d9854f24b84044338e22a54b3ebf79646a Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:05:05 +0200 Subject: [PATCH 08/17] Update amazon-kinesis-client to 1.15.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa1e6c5daeb9a..4eefb7c27c779 100644 --- a/pom.xml +++ b/pom.xml @@ -289,7 +289,7 @@ com.amazonaws amazon-kinesis-client - 1.6.3 + 1.15.0 com.amazonaws From a1cbaf61d086400a150dd3295b15268b1daf9b2a Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:21:33 +0200 Subject: [PATCH 09/17] Update protobuf to 3.24.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4eefb7c27c779..ea744a6737e41 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,7 @@ 4.17.0 8.5.6 1.3.1 - 3.23.2 + 3.24.3 4.5.0 4.1.99.Final 5.13.0 From f42260cc91f554d242802ddd47dfadc39bbbce9f Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:25:34 +0200 Subject: [PATCH 10/17] Update swagger to 1.6.11 --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ea744a6737e41..026ee0d18af94 100644 --- a/pom.xml +++ b/pom.xml @@ -166,6 +166,7 @@ 1.21 201 2.2.8 + 1.6.11 2.22.0 1.19.1 @@ -795,14 +796,14 @@ io.swagger swagger-annotations - 1.6.2 + ${dep.swagger.version} io.swagger swagger-core - 1.6.2 + ${dep.swagger.version} io.trino From 05eb0bf5f8f3d2aee3b92af057a5531af6541f3f Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:26:49 +0200 Subject: [PATCH 11/17] Update kotlin to 1.9.10 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 026ee0d18af94..e6d89c8bfcf87 100644 --- a/pom.xml +++ b/pom.xml @@ -167,6 +167,7 @@ 201 2.2.8 1.6.11 + 1.9.10 2.22.0 1.19.1 From 3f7808be7516d061e755a8835dea0c8bdb679b8b Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:30:03 +0200 Subject: [PATCH 12/17] Update Jedis to 4.4.5 --- plugin/trino-redis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/trino-redis/pom.xml b/plugin/trino-redis/pom.xml index cc9c1e0967198..af28a8b62360b 100644 --- a/plugin/trino-redis/pom.xml +++ b/plugin/trino-redis/pom.xml @@ -87,7 +87,7 @@ redis.clients jedis - 4.1.1 + 4.4.5 From aebc1502206f023a67231fe54ef32f4b665e027d Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:30:56 +0200 Subject: [PATCH 13/17] Update sqlite-jdbc to 3.43.0.0 --- plugin/trino-iceberg/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/trino-iceberg/pom.xml b/plugin/trino-iceberg/pom.xml index 2a8c074b561ad..a8da3d6b807bb 100644 --- a/plugin/trino-iceberg/pom.xml +++ b/plugin/trino-iceberg/pom.xml @@ -591,7 +591,7 @@ org.xerial sqlite-jdbc - 3.36.0.3 + 3.43.0.0 test From 2662bf194090e8820035ce9683be5aae88d41ef0 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:32:40 +0200 Subject: [PATCH 14/17] Update httpcomponents to 4.4.16 --- plugin/trino-elasticsearch/pom.xml | 4 ++-- plugin/trino-pinot/pom.xml | 2 +- plugin/trino-prometheus/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/trino-elasticsearch/pom.xml b/plugin/trino-elasticsearch/pom.xml index de8d6b3a9c03e..2042f25f70355 100644 --- a/plugin/trino-elasticsearch/pom.xml +++ b/plugin/trino-elasticsearch/pom.xml @@ -141,13 +141,13 @@ org.apache.httpcomponents httpcore - 4.4.13 + 4.4.16 org.apache.httpcomponents httpcore-nio - 4.4.13 + 4.4.16 diff --git a/plugin/trino-pinot/pom.xml b/plugin/trino-pinot/pom.xml index aad3331a55215..d719515c1cbf8 100755 --- a/plugin/trino-pinot/pom.xml +++ b/plugin/trino-pinot/pom.xml @@ -507,7 +507,7 @@ org.apache.httpcomponents httpcore - 4.4.13 + 4.4.16 runtime diff --git a/plugin/trino-prometheus/pom.xml b/plugin/trino-prometheus/pom.xml index ea38868f32433..f6d46d9b12f9c 100644 --- a/plugin/trino-prometheus/pom.xml +++ b/plugin/trino-prometheus/pom.xml @@ -211,7 +211,7 @@ org.apache.httpcomponents httpcore - 4.4.13 + 4.4.16 test From e35ff866f292231b27796d405626761fe03009bc Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:33:14 +0200 Subject: [PATCH 15/17] Update httpclient to 4.5.14 --- plugin/trino-elasticsearch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/trino-elasticsearch/pom.xml b/plugin/trino-elasticsearch/pom.xml index 2042f25f70355..16b18c9f756b3 100644 --- a/plugin/trino-elasticsearch/pom.xml +++ b/plugin/trino-elasticsearch/pom.xml @@ -128,7 +128,7 @@ org.apache.httpcomponents httpclient - 4.5.13 + 4.5.14 From 78db581e1fd36042472f6fcfe9a3ded736a32989 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:47:26 +0200 Subject: [PATCH 16/17] Update google dependencies for filesystem-exchange --- plugin/trino-exchange-filesystem/pom.xml | 18 +++++++++++++----- pom.xml | 20 +++++++++++++++++++- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/plugin/trino-exchange-filesystem/pom.xml b/plugin/trino-exchange-filesystem/pom.xml index f82e203f091b9..f3193902e3825 100644 --- a/plugin/trino-exchange-filesystem/pom.xml +++ b/plugin/trino-exchange-filesystem/pom.xml @@ -67,7 +67,7 @@ com.google.api gax - 2.17.0 + 2.34.1 com.google.protobuf @@ -91,13 +91,13 @@ com.google.auth google-auth-library-credentials - 1.6.0 + 1.19.0 com.google.auth google-auth-library-oauth2-http - 1.6.0 + 1.19.0 commons-logging @@ -113,7 +113,7 @@ com.google.cloud google-cloud-core - 2.5.6 + 2.24.1 com.google.protobuf @@ -129,7 +129,7 @@ com.google.cloud google-cloud-storage - 2.5.1 + 2.27.1 com.google.auto.value @@ -147,6 +147,14 @@ com.google.protobuf protobuf-java + + com.google.re2j + re2j + + + io.opencensus + opencensus-proto + javax.annotation javax.annotation-api diff --git a/pom.xml b/pom.xml index e6d89c8bfcf87..85219aa79a97d 100644 --- a/pom.xml +++ b/pom.xml @@ -168,7 +168,7 @@ 2.2.8 1.6.11 1.9.10 - + 1.43.3 2.22.0 1.19.1 1.0.8 @@ -473,6 +473,12 @@ 6.4.6 + + com.google.auto.value + auto-value-annotations + 1.10.2 + + com.google.cloud.bigdataoss gcs-connector @@ -499,6 +505,18 @@ ${dep.errorprone.version} + + com.google.http-client + google-http-client + ${dep.google.http.client.version} + + + + com.google.http-client + google-http-client-gson + ${dep.google.http.client.version} + + com.google.protobuf protobuf-java From 19b7b2108833228fe1cc8a19c57b93fbc514c8a5 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 3 Oct 2023 15:56:07 +0200 Subject: [PATCH 17/17] Use assertj version for assertj-guava --- core/trino-main/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/trino-main/pom.xml b/core/trino-main/pom.xml index 7e24dbf39a9f7..17bc703107b8f 100644 --- a/core/trino-main/pom.xml +++ b/core/trino-main/pom.xml @@ -473,7 +473,7 @@ org.assertj assertj-guava - 3.4.0 + ${dep.assertj-core.version} test