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.

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

Update various dependencies (both libraries and plugins) #17384

Merged
merged 20 commits into from
May 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN \
chown -R "trino:trino" /usr/lib/trino /data/trino

ARG TRINO_VERSION
COPY trino-cli-${TRINO_VERSION}-executable.jar /usr/bin/trino
COPY --chown=trino:trino trino-cli-${TRINO_VERSION}-executable.jar /usr/bin/trino
wendigo marked this conversation as resolved.
Show resolved Hide resolved
COPY --chown=trino:trino trino-server-${TRINO_VERSION} /usr/lib/trino
COPY --chown=trino:trino default/etc /etc/trino
COPY --chown=trino:trino --from=builder /tmp/jvmkill/libjvmkill.so /usr/lib/trino/bin
Expand Down
4 changes: 2 additions & 2 deletions core/trino-spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,12 @@
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
<version>0.14.7</version>
<version>0.15.0</version>
<dependencies>
<dependency>
<groupId>org.revapi</groupId>
<artifactId>revapi-java</artifactId>
<version>0.27.0</version>
<version>0.28.1</version>
</dependency>
</dependencies>
<executions>
Expand Down
12 changes: 9 additions & 3 deletions plugin/trino-bigquery/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<type>pom</type>
<version>26.1.2</version>
<version>26.14.0</version>
<scope>import</scope>
</dependency>

Expand All @@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.15</version>
<version>4.4.16</version>
</dependency>

<dependency>
Expand All @@ -54,7 +54,7 @@
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>1.6.1</version>
<version>1.6.8</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -311,6 +311,12 @@
<groupId>io.trino</groupId>
<artifactId>trino-exchange-filesystem</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.google.re2j</groupId>
<artifactId>re2j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
38 changes: 19 additions & 19 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@

<dep.accumulo.version>1.10.2</dep.accumulo.version>
<dep.accumulo-hadoop.version>2.7.7-1</dep.accumulo-hadoop.version>
<dep.antlr.version>4.11.1</dep.antlr.version>
<dep.antlr.version>4.12.0</dep.antlr.version>
<dep.airlift.version>230</dep.airlift.version>
<dep.arrow.version>9.0.0</dep.arrow.version>
<dep.arrow.version>11.0.0</dep.arrow.version>
<dep.avro.version>1.11.1</dep.avro.version>
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.aws-sdk.version>1.12.445</dep.aws-sdk.version>
<dep.aws-sdk.version>1.12.464</dep.aws-sdk.version>
<dep.jsonwebtoken.version>0.11.5</dep.jsonwebtoken.version>
<dep.oracle.version>21.9.0.0</dep.oracle.version>
<dep.drift.version>1.14</dep.drift.version>
Expand All @@ -70,7 +70,7 @@
<dep.iceberg.version>1.2.1</dep.iceberg.version>
<dep.protobuf.version>3.22.2</dep.protobuf.version>
<dep.wire.version>4.5.0</dep.wire.version>
<dep.netty.version>4.1.91.Final</dep.netty.version>
<dep.netty.version>4.1.92.Final</dep.netty.version>
<dep.jna.version>5.13.0</dep.jna.version>
<dep.okio.version>3.3.0</dep.okio.version>

Expand Down Expand Up @@ -841,7 +841,7 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>bytecode</artifactId>
<version>1.4</version>
<version>1.5</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -1105,7 +1105,7 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where this is used? Can we drop it maybe?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is used. We can rewrite call sites

<version>3.0.5</version>
<version>3.1.6</version>
</dependency>

<dependency>
Expand All @@ -1123,7 +1123,7 @@
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>6.4.1</version>
<version>6.4.2</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -1293,13 +1293,13 @@
<dependency>
<groupId>dev.failsafe</groupId>
<artifactId>failsafe</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</dependency>

<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.0</version>
<version>4.7.3</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -1539,7 +1539,7 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.1</version>
<version>1.14.4</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -1771,13 +1771,13 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.31.0</version>
<version>3.33.0</version>
</dependency>

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.4.1</version>
<version>3.5.1</version>
</dependency>

<dependency>
Expand All @@ -1803,7 +1803,7 @@
<groupId>org.jdbi</groupId>
<artifactId>jdbi3-bom</artifactId>
<type>pom</type>
<version>3.37.1</version>
<version>3.38.2</version>
<scope>import</scope>
</dependency>

Expand Down Expand Up @@ -1840,7 +1840,7 @@
<dependency>
<groupId>org.openjdk.jol</groupId>
<artifactId>jol-core</artifactId>
<version>0.16</version>
<version>0.17</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -1944,7 +1944,7 @@
<plugin>
<groupId>org.skife.maven</groupId>
<artifactId>really-executable-jar-maven-plugin</artifactId>
<version>1.0.5</version>
<version>2.1.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like a major change. What changed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way zip is made executable. Plugin works the same

</plugin>

<plugin>
Expand All @@ -1956,7 +1956,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<version>3.1.0</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -2048,12 +2048,12 @@
<dependency>
<groupId>com.github.ferstl</groupId>
<artifactId>pedantic-pom-enforcers</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>de.skuzzle.enforcer</groupId>
<artifactId>restrict-imports-enforcer-rule</artifactId>
<version>2.1.0</version>
<version>2.2.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -2353,7 +2353,7 @@
<plugin>
<groupId>io.github.gitflow-incremental-builder</groupId>
<artifactId>gitflow-incremental-builder</artifactId>
<version>4.1.1</version>
<version>4.4.1</version>
<extensions>true</extensions>
<configuration>
<disableIfBranchMatches>master</disableIfBranchMatches>
Expand Down