Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Major dependencies upgrade #19245

Merged
merged 17 commits into from
Oct 4, 2023
Merged

Major dependencies upgrade #19245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1e20339
Update to airbase 147
wendigo Oct 3, 2023
8e9a182
Pin ASM in plugin dependencies to 9.6
wendigo Oct 3, 2023
0e5b177
Update testcontainers to 1.19.1
wendigo Oct 3, 2023
6624afe
Update BQ libraries to 26.23.0
wendigo Oct 3, 2023
61d0fc3
Update JDBI to 3.41.3
wendigo Oct 3, 2023
afb7d90
Update AWS SDK v2 to 2.20.158
wendigo Oct 3, 2023
d9132ac
Update AWS SDK v1 to 1.12.561
wendigo Oct 3, 2023
d9e841d
Update amazon-kinesis-client to 1.15.0
wendigo Oct 3, 2023
a1cbaf6
Update protobuf to 3.24.3
wendigo Oct 3, 2023
f42260c
Update swagger to 1.6.11
wendigo Oct 3, 2023
05eb0bf
Update kotlin to 1.9.10
wendigo Oct 3, 2023
3f7808b
Update Jedis to 4.4.5
wendigo Oct 3, 2023
aebc150
Update sqlite-jdbc to 3.43.0.0
wendigo Oct 3, 2023
2662bf1
Update httpcomponents to 4.4.16
wendigo Oct 3, 2023
e35ff86
Update httpclient to 4.5.14
wendigo Oct 3, 2023
78db581
Update google dependencies for filesystem-exchange
wendigo Oct 3, 2023
19b7b21
Use assertj version for assertj-guava
wendigo Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/trino-main/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-guava</artifactId>
<version>3.4.0</version>
<version>${dep.assertj-core.version}</version>
wendigo marked this conversation as resolved.
Show resolved Hide resolved
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-bigquery/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.18.0</version>
<version>26.23.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions plugin/trino-elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
<version>4.5.14</version>
<exclusions>
<!-- Brings in duplicate classes already in org.slf4j:jcl-over-slf4j (from io.airlift:log-manager) -->
<exclusion>
Expand All @@ -141,13 +141,13 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.13</version>
<version>4.4.16</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-nio</artifactId>
<version>4.4.13</version>
<version>4.4.16</version>
</dependency>

<dependency>
Expand Down
18 changes: 13 additions & 5 deletions plugin/trino-exchange-filesystem/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
<version>2.17.0</version>
<version>2.34.1</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
Expand All @@ -91,13 +91,13 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
<version>1.6.0</version>
<version>1.19.0</version>
</dependency>

<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>1.6.0</version>
<version>1.19.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Expand All @@ -113,7 +113,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>2.5.6</version>
<version>2.24.1</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
Expand All @@ -129,7 +129,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.5.1</version>
<version>2.27.1</version>
<exclusions>
<exclusion>
<groupId>com.google.auto.value</groupId>
Expand All @@ -147,6 +147,14 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.re2j</groupId>
<artifactId>re2j</artifactId>
</exclusion>
<exclusion>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-proto</artifactId>
</exclusion>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-iceberg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.36.0.3</version>
<version>3.43.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-pinot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.13</version>
<version>4.4.16</version>
<scope>runtime</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-prometheus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.13</version>
<version>4.4.16</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-redis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>4.1.1</version>
<version>4.4.5</version>
</dependency>

<dependency>
Expand Down
69 changes: 32 additions & 37 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>146</version>
<version>147</version>
</parent>

<groupId>io.trino</groupId>
Expand Down Expand Up @@ -159,31 +159,33 @@
<dep.avro.version>1.11.3</dep.avro.version>
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.takari.version>2.1.1</dep.takari.version>
<dep.aws-sdk.version>1.12.560</dep.aws-sdk.version>
<dep.aws-sdk-v2.version>2.20.157</dep.aws-sdk-v2.version>
<dep.aws-sdk.version>1.12.561</dep.aws-sdk.version>
<dep.aws-sdk-v2.version>2.20.158</dep.aws-sdk-v2.version>
<dep.jsonwebtoken.version>0.11.5</dep.jsonwebtoken.version>
<dep.oracle.version>21.9.0.0</dep.oracle.version>
<dep.drift.version>1.21</dep.drift.version>
<dep.tempto.version>201</dep.tempto.version>
<dep.gcs.version>2.2.8</dep.gcs.version>

<dep.swagger.version>1.6.11</dep.swagger.version>
<dep.kotlin.version>1.9.10</dep.kotlin.version>
<dep.google.http.client.version>1.43.3</dep.google.http.client.version>
<dep.errorprone.version>2.22.0</dep.errorprone.version>
<dep.testcontainers.version>1.19.0</dep.testcontainers.version>
<dep.testcontainers.version>1.19.1</dep.testcontainers.version>
<dep.duct-tape.version>1.0.8</dep.duct-tape.version>
<dep.confluent.version>7.3.1</dep.confluent.version>
<dep.kafka-clients.version>3.3.2</dep.kafka-clients.version>
<dep.casandra.version>4.17.0</dep.casandra.version>
<dep.minio.version>8.5.6</dep.minio.version>
<dep.iceberg.version>1.3.1</dep.iceberg.version>
<dep.protobuf.version>3.23.2</dep.protobuf.version>
<dep.protobuf.version>3.24.3</dep.protobuf.version>
<dep.wire.version>4.5.0</dep.wire.version>
<dep.netty.version>4.1.99.Final</dep.netty.version>
<dep.jna.version>5.13.0</dep.jna.version>
<dep.okio.version>3.3.0</dep.okio.version>
<dep.flyway.version>9.22.2</dep.flyway.version>
<dep.parquet.version>1.13.1</dep.parquet.version>
<dep.antlr.version>4.13.1</dep.antlr.version>
<dep.logback.version>1.4.8</dep.logback.version>
<dep.asm.version>9.6</dep.asm.version>

<dep.docker.images.version>86</dep.docker.images.version>

Expand Down Expand Up @@ -251,15 +253,15 @@
<dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi3-bom</artifactId>
<version>3.41.2</version>
<version>3.41.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-bom</artifactId>
<version>9.6</version>
<version>${dep.asm.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -289,7 +291,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>amazon-kinesis-client</artifactId>
<version>1.6.3</version>
<version>1.15.0</version>
<exclusions>
<exclusion>
<groupId>com.amazonaws</groupId>
Expand Down Expand Up @@ -471,6 +473,12 @@
<version>6.4.6</version>
</dependency>

<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
<version>1.10.2</version>
</dependency>

<dependency>
<groupId>com.google.cloud.bigdataoss</groupId>
<artifactId>gcs-connector</artifactId>
Expand All @@ -497,6 +505,18 @@
<version>${dep.errorprone.version}</version>
</dependency>

<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<version>${dep.google.http.client.version}</version>
</dependency>

<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-gson</artifactId>
<version>${dep.google.http.client.version}</version>
</dependency>

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand Down Expand Up @@ -795,14 +815,14 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.6.2</version>
<version>${dep.swagger.version}</version>
</dependency>

<!-- io.confluent:kafka-avro-serializer uses multiple versions of this transitive dependency -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>1.6.2</version>
<version>${dep.swagger.version}</version>
</dependency>
<dependency>
<groupId>io.trino</groupId>
Expand Down Expand Up @@ -2096,31 +2116,6 @@
</configuration>
</plugin>

<plugin>
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
<version>3.2.1</version>
<configuration>
<createBackupFile>false</createBackupFile>
<nrOfIndentSpace>4</nrOfIndentSpace>
<sortModules>true</sortModules>
<sortDependencies>scope,groupId,artifactId</sortDependencies>
<sortDependencyExclusions>groupId,artifactId</sortDependencyExclusions>
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
<expandEmptyElements>false</expandEmptyElements>
<verifyFailOn>Strict</verifyFailOn>
<verifyFail>Stop</verifyFail>
</configuration>
<executions>
<execution>
<goals>
<goal>verify</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down
Loading