Update dependencies

nineinchnick · Jan 28, 2025 · b41e6e0 · b41e6e0
1 parent 935e28e
commit b41e6e0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 40 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>194</version>
+        <version>212</version>
     </parent>
 
     <groupId>pl.net.was</groupId>
@@ -50,24 +50,24 @@
         <air.check.skip-checkstyle>false</air.check.skip-checkstyle>
         <air.build.jvmsize>4g</air.build.jvmsize>
 
-        <dep.trino.version>464</dep.trino.version>
-        <dep.airlift.version>279</dep.airlift.version>
+        <dep.trino.version>469</dep.trino.version>
+        <dep.airlift.version>297</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.43.0</dep.opentelemetry.version>
-        <dep.opentelemetry-instrumentation.version>2.9.0</dep.opentelemetry-instrumentation.version>
+        <dep.opentelemetry.version>1.46.0</dep.opentelemetry.version>
+        <dep.opentelemetry-instrumentation.version>2.12.0</dep.opentelemetry-instrumentation.version>
         <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
-        <dep.guava.version>33.3.1-jre</dep.guava.version>
+        <dep.guava.version>33.4.0-jre</dep.guava.version>
         <dep.guice.version>7.0.0</dep.guice.version>
-        <dep.errorprone.version>2.35.1</dep.errorprone.version>
-        <dep.jackson.version>2.18.1</dep.jackson.version>
+        <dep.errorprone.version>2.36.0</dep.errorprone.version>
+        <dep.jackson.version>2.18.2</dep.jackson.version>
         <dep.joda.version>2.13.0</dep.joda.version>
-        <dep.junit.version>5.11.3</dep.junit.version>
+        <dep.junit.version>5.11.4</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.12</dep.logback.version>
+        <dep.assertj-core.version>3.27.3</dep.assertj-core.version>
+        <dep.logback.version>1.5.16</dep.logback.version>
         <dep.plugin.surefire.version>3.2.5</dep.plugin.surefire.version>
-        <dep.jna.version>5.14.0</dep.jna.version>
+        <dep.jna.version>5.16.0</dep.jna.version>
 
         <project.scm.id>github</project.scm.id>
     </properties>
@@ -107,6 +107,11 @@
                 <artifactId>opentelemetry-semconv</artifactId>
                 <version>${dep.opentelemetry-semconv-incubating.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>${dep.jna.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-runtime</artifactId>
@@ -171,13 +176,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
-            <version>${dep.errorprone.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-memory</artifactId>
@@ -265,26 +263,6 @@
                 <version>3.3.2</version>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration combine.children="append">
-                    <fork>false</fork>
-                    <compilerArgs>
-                        <arg>-XDcompilePolicy=simple</arg>
-                        <arg>-Xplugin:ErrorProne</arg>
-                    </compilerArgs>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>com.google.errorprone</groupId>
-                            <artifactId>error_prone_core</artifactId>
-                            <version>${dep.errorprone.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
-                    <fork>false</fork>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</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.29.4</version>
+                <version>2.30.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
@@ -375,6 +375,7 @@ public ColumnHandle getMergeRowIdColumnHandle(
     public ConnectorMergeTableHandle beginMerge(
             ConnectorSession session,
             ConnectorTableHandle tableHandle,
+            Map<Integer, Collection<ColumnHandle>> updateCaseColumns,
             RetryMode retryMode)
     {
         if (retryMode != RetryMode.NO_RETRIES) {