Update dependencies

nineinchnick · Aug 19, 2024 · aec49ce · aec49ce
1 parent e6f13fe
commit aec49ce
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>158</version>
+        <version>165</version>
     </parent>
 
     <groupId>pl.net.was</groupId>
@@ -50,21 +50,22 @@
         <air.check.skip-checkstyle>false</air.check.skip-checkstyle>
         <air.build.jvmsize>4g</air.build.jvmsize>
 
-        <dep.trino.version>452</dep.trino.version>
-        <dep.airlift.version>250</dep.airlift.version>
-        <dep.slice.version>2.2</dep.slice.version>
+        <dep.trino.version>454</dep.trino.version>
+        <dep.airlift.version>260</dep.airlift.version>
+        <dep.slice.version>2.3</dep.slice.version>
+        <!-- temporary: required to be in sync with version pulled by libraries-bom -->
         <dep.opentelemetry.version>1.40.0</dep.opentelemetry.version>
-        <dep.opentelemetry-instrumentation.version>2.5.0</dep.opentelemetry-instrumentation.version>
+        <dep.opentelemetry-instrumentation.version>2.7.0</dep.opentelemetry-instrumentation.version>
         <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
-        <dep.guava.version>33.2.1-jre</dep.guava.version>
+        <dep.guava.version>33.3.0-jre</dep.guava.version>
         <dep.guice.version>7.0.0</dep.guice.version>
-        <dep.errorprone.version>2.28.0</dep.errorprone.version>
+        <dep.errorprone.version>2.30.0</dep.errorprone.version>
         <dep.jackson.version>2.17.2</dep.jackson.version>
         <dep.joda.version>2.12.7</dep.joda.version>
-        <dep.junit.version>5.10.3</dep.junit.version>
-        <dep.slf4j.version>2.0.13</dep.slf4j.version>
+        <dep.junit.version>5.11.0</dep.junit.version>
+        <dep.slf4j.version>2.0.16</dep.slf4j.version>
         <dep.assertj-core.version>3.26.3</dep.assertj-core.version>
-        <dep.logback.version>1.5.6</dep.logback.version>
+        <dep.logback.version>1.5.7</dep.logback.version>
         <dep.plugin.surefire.version>3.2.5</dep.plugin.surefire.version>
         <dep.jna.version>5.14.0</dep.jna.version>
 
@@ -95,6 +96,17 @@
                 <artifactId>units</artifactId>
                 <version>1.10</version>
             </dependency>
+            <!-- temporary to settle a version between airbase and airlift -->
+            <dependency>
+                <groupId>io.opentelemetry.semconv</groupId>
+                <artifactId>opentelemetry-semconv</artifactId>
+                <version>${dep.opentelemetry-semconv-incubating.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-runtime</artifactId>
+                <version>4.13.2</version>
+            </dependency>
             <dependency>
                 <groupId>org.openjdk.jol</groupId>
                 <artifactId>jol-core</artifactId>

diff --git a/trino-cloud-aws/pom.xml b/trino-cloud-aws/pom.xml
@@ -22,7 +22,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.26.19</version>
+                <version>2.27.7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/AwsMetadata.java b/trino-cloud-aws/src/main/java/pl/net/was/cloud/aws/AwsMetadata.java
@@ -389,7 +389,8 @@ public ConnectorMergeTableHandle beginMerge(
     @Override
     public void finishMerge(
             ConnectorSession session,
-            ConnectorMergeTableHandle tableHandle,
+            ConnectorMergeTableHandle mergeTableHandle,
+            List<ConnectorTableHandle> sourceTableHandles,
             Collection<Slice> fragments,
             Collection<ComputedStatistics> computedStatistics)
     {