From 33f73cd71edd3e27326b48479d4db23b4bd5b398 Mon Sep 17 00:00:00 2001
From: "Mateusz \"Serafin\" Gajewski" <mateusz.gajewski@gmail.com>
Date: Tue, 18 Apr 2023 13:01:17 +0200
Subject: [PATCH] Update Azure & AWS SDKs in exchange filesystem

---
 plugin/trino-delta-lake/pom.xml                           | 4 ++--
 plugin/trino-exchange-filesystem/pom.xml                  | 8 ++++----
 .../exchange/filesystem/containers/MinioStorage.java      | 2 ++
 pom.xml                                                   | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugin/trino-delta-lake/pom.xml b/plugin/trino-delta-lake/pom.xml
index 3203ba076f95..bdc850f0619f 100644
--- a/plugin/trino-delta-lake/pom.xml
+++ b/plugin/trino-delta-lake/pom.xml
@@ -362,7 +362,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>
-            <version>1.25.0</version>
+            <version>1.37.0</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -379,7 +379,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-storage-blob</artifactId>
-            <version>12.14.4</version>
+            <version>12.21.1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugin/trino-exchange-filesystem/pom.xml b/plugin/trino-exchange-filesystem/pom.xml
index 1b3d30f44b49..2aa3296338f0 100644
--- a/plugin/trino-exchange-filesystem/pom.xml
+++ b/plugin/trino-exchange-filesystem/pom.xml
@@ -14,8 +14,8 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <awsjavasdk.version>2.17.151</awsjavasdk.version>
-        <azurejavasdk.version>1.1.1</azurejavasdk.version>
+        <awsjavasdk.version>2.20.48</awsjavasdk.version>
+        <azurejavasdk.version>1.2.11</azurejavasdk.version>
     </properties>
 
     <dependencyManagement>
@@ -220,7 +220,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.4.13</version>
+            <version>3.4.27</version>
         </dependency>
 
         <dependency>
@@ -241,7 +241,7 @@
         <dependency>
             <groupId>org.reactivestreams</groupId>
             <artifactId>reactive-streams</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>
diff --git a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/containers/MinioStorage.java b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/containers/MinioStorage.java
index 1aa0c93df658..66e07e6b3857 100644
--- a/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/containers/MinioStorage.java
+++ b/plugin/trino-exchange-filesystem/src/test/java/io/trino/plugin/exchange/filesystem/containers/MinioStorage.java
@@ -58,6 +58,7 @@ public void start()
                 .endpointOverride(URI.create("http://localhost:" + minio.getMinioApiEndpoint().getPort()))
                 .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(ACCESS_KEY, SECRET_KEY)))
                 .region(US_EAST_1)
+                .forcePathStyle(true)
                 .build();
         CreateBucketRequest createBucketRequest = CreateBucketRequest.builder()
                 .bucket(bucketName)
@@ -92,6 +93,7 @@ public static Map<String, String> getExchangeManagerProperties(MinioStorage mini
                 .put("exchange.s3.aws-access-key", MinioStorage.ACCESS_KEY)
                 .put("exchange.s3.aws-secret-key", MinioStorage.SECRET_KEY)
                 .put("exchange.s3.region", "us-east-1")
+                .put("exchange.s3.path-style-access", "true")
                 .put("exchange.s3.endpoint", "http://" + minioStorage.getMinio().getMinioApiEndpoint())
                 // create more granular source handles given the fault-tolerant execution target task input size is set to lower value for testing
                 .put("exchange.source-handle-target-data-size", "1MB")
diff --git a/pom.xml b/pom.xml
index 809abc4f7d32..980f671304f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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.79.Final</dep.netty.version>
+        <dep.netty.version>4.1.91.Final</dep.netty.version>
         <dep.jna.version>5.13.0</dep.jna.version>
 
         <dep.docker.images.version>79</dep.docker.images.version>