From 80082a9c047e0a60481bc3836bfcc1ab7cd8500b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wa=C5=9B?= Date: Fri, 12 Jan 2024 13:44:02 +0100 Subject: [PATCH] Update dependencies --- .github/workflows/annotate.yml | 2 +- .github/workflows/maven.yaml | 8 +- .github/workflows/release.yaml | 8 +- jreleaser.yml | 2 +- pom.xml | 6 +- trino-example-jdbc/jreleaser.yml | 2 +- trino-example-jdbc/pom.xml | 199 +++++++++--------- .../trino/plugin/example/ExampleClient.java | 5 +- .../plugin/example/TestExampleQueries.java | 2 +- .../example/TestingPostgreSqlServer.java | 2 + trino-example-plugin/jreleaser.yml | 2 +- trino-example-plugin/pom.xml | 157 +++++++------- .../plugin/example/ExampleConnector.java | 3 +- .../example/ExampleRecordSetProvider.java | 3 +- .../plugin/example/ExampleSplitManager.java | 3 +- .../plugin/example/TestExampleQueries.java | 2 +- 16 files changed, 204 insertions(+), 202 deletions(-) diff --git a/.github/workflows/annotate.yml b/.github/workflows/annotate.yml index d93c11d..4893e4f 100644 --- a/.github/workflows/annotate.yml +++ b/.github/workflows/annotate.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Download artifact' - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | const fs = require('fs'); diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 3131eca..bec3500 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -8,12 +8,12 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up the JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: '17' - distribution: 'adopt' + java-version: '21' + distribution: 'temurin' server-id: github cache: 'maven' - name: Build with Maven diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c09bb82..d433f8e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,15 +9,15 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up the JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: '17' - distribution: 'adopt' + java-version: '21' + distribution: 'temurin' server-id: github cache: 'maven' - name: Configure Git user diff --git a/jreleaser.yml b/jreleaser.yml index b504b02..3e21fbb 100644 --- a/jreleaser.yml +++ b/jreleaser.yml @@ -4,7 +4,7 @@ project: license: Apache-2 java: groupId: pl.net.was - version: 17 + version: 21 authors: - Jan Waś inceptionYear: 2021 diff --git a/pom.xml b/pom.xml index 18fdf3f..90abf0d 100644 --- a/pom.xml +++ b/pom.xml @@ -43,9 +43,9 @@ UTF-8 - 17 - 17 - 17 + 21 + 21 + 21 github diff --git a/trino-example-jdbc/jreleaser.yml b/trino-example-jdbc/jreleaser.yml index c71b476..c62a4c6 100644 --- a/trino-example-jdbc/jreleaser.yml +++ b/trino-example-jdbc/jreleaser.yml @@ -4,7 +4,7 @@ project: license: Apache-2 java: groupId: ${groupId} - version: 17 + version: 21 files: artifacts: diff --git a/trino-example-jdbc/pom.xml b/trino-example-jdbc/pom.xml index f389eb6..41e80c3 100644 --- a/trino-example-jdbc/pom.xml +++ b/trino-example-jdbc/pom.xml @@ -2,17 +2,17 @@ 4.0.0 - pl.net.was - trino-example-jdbc - 0.6-SNAPSHOT - trino-plugin - io.airlift airbase - 139 + 148 + pl.net.was + trino-example-jdbc + 0.6-SNAPSHOT + trino-plugin + Apache License 2.0 @@ -21,8 +21,22 @@ + + scm:git:https://github.com/${githubOwner}/${githubRepo}.git + HEAD + + + + + github + GitHub Maven Packages + https://maven.pkg.github.com/${githubOwner}/${githubRepo} + + + - 17 + 21 + 21.0.1 \${project.basedir} @@ -34,28 +48,22 @@ true false - 418 - 231 - 2.19.1 + 436 + 239 + 2.12.6 + 2.24.1 -missing github - - scm:git:https://github.com/${githubOwner}/${githubRepo}.git - HEAD - + - - - github - GitHub Maven Packages - https://maven.pkg.github.com/${githubOwner}/${githubRepo} - - + + com.google.inject + guice + - io.airlift configuration @@ -63,102 +71,103 @@ - io.airlift - log - ${dep.airlift.version} - runtime + io.trino + trino-base-jdbc + ${dep.trino.version} - io.airlift - log-manager - ${dep.airlift.version} - runtime + io.trino + trino-plugin-toolkit + ${dep.trino.version} - com.google.guava - guava - runtime + com.fasterxml.jackson.core + jackson-annotations + provided - com.google.inject - guice + io.airlift + slice + provided - com.google.errorprone - error_prone_annotations - ${dep.errorprone.version} - runtime + io.opentelemetry + opentelemetry-api + provided - javax.inject - javax.inject + io.opentelemetry + opentelemetry-context + provided - com.github.docker-java - docker-java-api - 3.3.0 - test + io.trino + trino-spi + ${dep.trino.version} + provided - org.jetbrains - annotations - 24.0.1 - test + org.openjdk.jol + jol-core + 0.17 + provided - - io.trino - trino-spi - provided - ${dep.trino.version} + com.google.errorprone + error_prone_annotations + ${dep.errorprone.version} + runtime - io.trino - trino-base-jdbc - ${dep.trino.version} + com.google.guava + guava + runtime io.airlift - slice - provided + log + ${dep.airlift.version} + runtime - io.opentelemetry - opentelemetry-api - provided + io.airlift + log-manager + ${dep.airlift.version} + runtime - io.opentelemetry - opentelemetry-context - provided + io.airlift + units + 1.10 + runtime - org.openjdk.jol - jol-core - 0.17 - provided + com.github.docker-java + docker-java-api + 3.3.0 + test - com.fasterxml.jackson.core - jackson-annotations - provided + io.airlift + testing + ${dep.airlift.version} + test - io.trino trino-main @@ -168,65 +177,63 @@ io.trino - trino-testing + trino-memory ${dep.trino.version} test io.trino - trino-tpch + trino-testing ${dep.trino.version} test io.trino - trino-memory + trino-testing-containers ${dep.trino.version} test - org.testng - testng + io.trino + trino-tpch + ${dep.trino.version} test - io.airlift - testing - ${dep.airlift.version} + org.jetbrains + annotations + 24.0.1 test - io.airlift - units - 1.8 - runtime + org.junit.jupiter + junit-jupiter-api + test - - org.testcontainers + org.postgresql postgresql - 1.18.1 + 42.6.0 test org.testcontainers - testcontainers + postgresql 1.18.1 test - - org.postgresql - postgresql - 42.6.0 + org.testcontainers + testcontainers + 1.18.1 test @@ -241,7 +248,7 @@ maven-release-plugin - 3.0.0 + 3.0.1 [ci skip] v@{project.version} @@ -251,7 +258,7 @@ org.apache.maven.plugins maven-scm-plugin - 2.0.0 + 2.0.1 true @@ -271,8 +278,8 @@ ca.vanzyl.provisio.maven.plugins provisio-maven-plugin - true 1.0.20 + true diff --git a/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClient.java b/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClient.java index 23e997c..36a344b 100644 --- a/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClient.java +++ b/trino-example-jdbc/src/main/java/io/trino/plugin/example/ExampleClient.java @@ -13,6 +13,8 @@ */ package io.trino.plugin.example; +import com.google.inject.Inject; +import io.trino.plugin.base.mapping.IdentifierMapping; import io.trino.plugin.jdbc.BaseJdbcClient; import io.trino.plugin.jdbc.BaseJdbcConfig; import io.trino.plugin.jdbc.ColumnMapping; @@ -21,15 +23,12 @@ import io.trino.plugin.jdbc.QueryBuilder; import io.trino.plugin.jdbc.WriteMapping; import io.trino.plugin.jdbc.logging.RemoteQueryModifier; -import io.trino.plugin.jdbc.mapping.IdentifierMapping; import io.trino.spi.TrinoException; import io.trino.spi.connector.ConnectorSession; import io.trino.spi.type.CharType; import io.trino.spi.type.Type; import io.trino.spi.type.VarcharType; -import javax.inject.Inject; - import java.sql.Connection; import java.sql.Types; import java.util.Optional; diff --git a/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestExampleQueries.java b/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestExampleQueries.java index 8e1aa61..461a178 100644 --- a/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestExampleQueries.java +++ b/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestExampleQueries.java @@ -16,7 +16,7 @@ import io.trino.testing.AbstractTestQueryFramework; import io.trino.testing.QueryRunner; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; public class TestExampleQueries extends AbstractTestQueryFramework diff --git a/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestingPostgreSqlServer.java b/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestingPostgreSqlServer.java index 00b76a8..a593221 100644 --- a/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestingPostgreSqlServer.java +++ b/trino-example-jdbc/src/test/java/io/trino/plugin/example/TestingPostgreSqlServer.java @@ -13,6 +13,7 @@ */ package io.trino.plugin.example; +import io.trino.testing.containers.junit.ReportLeakedContainers; import org.intellij.lang.annotations.Language; import org.testcontainers.containers.PostgreSQLContainer; @@ -49,6 +50,7 @@ public TestingPostgreSqlServer() .withHostConfig(requireNonNull(cmd.getHostConfig(), "hostConfig is null") .withPublishAllPorts(true))); dockerContainer.start(); + ReportLeakedContainers.ignoreContainerId(dockerContainer.getContainerId()); execute("CREATE TABLE test (key INT, value VARCHAR)"); execute("INSERT INTO test (key, value) VALUES (1, 'one'), (2, 'two')"); diff --git a/trino-example-plugin/jreleaser.yml b/trino-example-plugin/jreleaser.yml index c71b476..c62a4c6 100644 --- a/trino-example-plugin/jreleaser.yml +++ b/trino-example-plugin/jreleaser.yml @@ -4,7 +4,7 @@ project: license: Apache-2 java: groupId: ${groupId} - version: 17 + version: 21 files: artifacts: diff --git a/trino-example-plugin/pom.xml b/trino-example-plugin/pom.xml index 532d124..0b3a467 100644 --- a/trino-example-plugin/pom.xml +++ b/trino-example-plugin/pom.xml @@ -2,17 +2,17 @@ 4.0.0 - pl.net.was - trino-example-plugin - 0.6-SNAPSHOT - trino-plugin - io.airlift airbase - 139 + 148 + pl.net.was + trino-example-plugin + 0.6-SNAPSHOT + trino-plugin + Apache License 2.0 @@ -21,8 +21,22 @@ + + scm:git:https://github.com/${githubOwner}/${githubRepo}.git + HEAD + + + + + github + GitHub Maven Packages + https://maven.pkg.github.com/${githubOwner}/${githubRepo} + + + - 17 + 21 + 21.0.1 \${project.basedir} @@ -34,161 +48,144 @@ true false - 418 - 231 - 2.19.1 + 436 + 239 + 2.12.6 + 2.24.1 -missing github - - scm:git:https://github.com/${githubOwner}/${githubRepo}.git - HEAD - - - - - github - GitHub Maven Packages - https://maven.pkg.github.com/${githubOwner}/${githubRepo} - - - + - io.airlift - bootstrap - ${dep.airlift.version} + com.google.guava + guava - io.airlift - configuration - ${dep.airlift.version} + com.google.inject + guice io.airlift - log + bootstrap ${dep.airlift.version} - runtime io.airlift - log-manager + configuration ${dep.airlift.version} - runtime - com.google.guava - guava + javax.validation + validation-api - com.google.inject - guice + com.fasterxml.jackson.core + jackson-annotations + provided - com.google.errorprone - error_prone_annotations - ${dep.errorprone.version} - runtime + io.airlift + slice + provided - javax.inject - javax.inject + io.opentelemetry + opentelemetry-api + provided - javax.validation - validation-api + io.opentelemetry + opentelemetry-context + provided - io.trino trino-spi - provided ${dep.trino.version} + provided - io.airlift - slice - provided + com.google.errorprone + error_prone_annotations + ${dep.errorprone.version} + runtime - io.opentelemetry - opentelemetry-api - provided + io.airlift + log + ${dep.airlift.version} + runtime - io.opentelemetry - opentelemetry-context - provided + io.airlift + log-manager + ${dep.airlift.version} + runtime - com.fasterxml.jackson.core - jackson-annotations - provided + io.airlift + units + 1.10 + runtime - - io.trino - trino-main - ${dep.trino.version} + io.airlift + testing + ${dep.airlift.version} test io.trino - trino-testing + trino-main ${dep.trino.version} test io.trino - trino-tpch + trino-memory ${dep.trino.version} test io.trino - trino-memory + trino-testing ${dep.trino.version} test - org.testng - testng + io.trino + trino-tpch + ${dep.trino.version} test - io.airlift - testing - ${dep.airlift.version} + org.junit.jupiter + junit-jupiter-api test - - io.airlift - units - 1.8 - runtime - @@ -200,7 +197,7 @@ maven-release-plugin - 3.0.0 + 3.0.1 [ci skip] v@{project.version} @@ -210,7 +207,7 @@ org.apache.maven.plugins maven-scm-plugin - 2.0.0 + 2.0.1 true @@ -230,8 +227,8 @@ ca.vanzyl.provisio.maven.plugins provisio-maven-plugin - true 1.0.20 + true diff --git a/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleConnector.java b/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleConnector.java index 17bb3d1..7b7dcc8 100644 --- a/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleConnector.java +++ b/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleConnector.java @@ -14,6 +14,7 @@ package io.trino.plugin.example; +import com.google.inject.Inject; import io.trino.spi.connector.Connector; import io.trino.spi.connector.ConnectorMetadata; import io.trino.spi.connector.ConnectorRecordSetProvider; @@ -22,8 +23,6 @@ import io.trino.spi.connector.ConnectorTransactionHandle; import io.trino.spi.transaction.IsolationLevel; -import javax.inject.Inject; - import static io.trino.plugin.example.ExampleTransactionHandle.INSTANCE; import static java.util.Objects.requireNonNull; diff --git a/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleRecordSetProvider.java b/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleRecordSetProvider.java index d0b02c7..5932ce5 100644 --- a/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleRecordSetProvider.java +++ b/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleRecordSetProvider.java @@ -14,6 +14,7 @@ package io.trino.plugin.example; +import com.google.inject.Inject; import io.trino.spi.connector.ColumnHandle; import io.trino.spi.connector.ColumnMetadata; import io.trino.spi.connector.ConnectorRecordSetProvider; @@ -26,8 +27,6 @@ import io.trino.spi.connector.RecordSet; import io.trino.spi.type.Type; -import javax.inject.Inject; - import java.util.List; import java.util.stream.StreamSupport; diff --git a/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleSplitManager.java b/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleSplitManager.java index 7181a17..d392e4c 100644 --- a/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleSplitManager.java +++ b/trino-example-plugin/src/main/java/io/trino/plugin/example/ExampleSplitManager.java @@ -15,6 +15,7 @@ package io.trino.plugin.example; import com.google.common.collect.ImmutableList; +import com.google.inject.Inject; import io.trino.spi.HostAddress; import io.trino.spi.Node; import io.trino.spi.NodeManager; @@ -27,8 +28,6 @@ import io.trino.spi.connector.DynamicFilter; import io.trino.spi.connector.FixedSplitSource; -import javax.inject.Inject; - import java.util.List; import static java.util.stream.Collectors.toList; diff --git a/trino-example-plugin/src/test/java/io/trino/plugin/example/TestExampleQueries.java b/trino-example-plugin/src/test/java/io/trino/plugin/example/TestExampleQueries.java index ac9d371..a48cd41 100644 --- a/trino-example-plugin/src/test/java/io/trino/plugin/example/TestExampleQueries.java +++ b/trino-example-plugin/src/test/java/io/trino/plugin/example/TestExampleQueries.java @@ -16,7 +16,7 @@ import io.trino.testing.AbstractTestQueryFramework; import io.trino.testing.QueryRunner; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; public class TestExampleQueries extends AbstractTestQueryFramework