Skip to content

Commit 769f32d

Browse files
committed
DRILL-8530: Update AWS SDKs (#3015)
1 parent dc08295 commit 769f32d

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

distribution/pom.xml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
<name>Drill : Packaging and Distribution Assembly</name>
3232

3333
<properties>
34-
<aws.java.sdk.version>1.12.261</aws.java.sdk.version>
34+
<aws.java.sdk.version>2.32.24</aws.java.sdk.version>
35+
<!-- Hadoop has old AWS Jars. We are explicitly including the V1 libraries for Hadoop-S3 and using the V2 libraries for Drill. -->
36+
<aws.java.sdk.v1.version>1.12.367</aws.java.sdk.v1.version>
3537
<oci.hdfs.version>3.3.1.0.3.6</oci.hdfs.version>
3638
</properties>
3739

@@ -131,8 +133,8 @@
131133
</exclusions>
132134
</dependency>
133135
<dependency>
134-
<groupId>com.amazonaws</groupId>
135-
<artifactId>aws-java-sdk-core</artifactId>
136+
<groupId>software.amazon.awssdk</groupId>
137+
<artifactId>aws-core</artifactId>
136138
<version>${aws.java.sdk.version}</version>
137139
<exclusions>
138140
<exclusion>
@@ -142,19 +144,31 @@
142144
</exclusions>
143145
</dependency>
144146
<dependency>
145-
<groupId>com.amazonaws</groupId>
146-
<artifactId>aws-java-sdk-dynamodb</artifactId>
147+
<groupId>software.amazon.awssdk</groupId>
148+
<artifactId>dynamodb</artifactId>
147149
<version>${aws.java.sdk.version}</version>
148150
</dependency>
149151
<dependency>
150-
<groupId>com.amazonaws</groupId>
151-
<artifactId>aws-java-sdk-sts</artifactId>
152+
<groupId>software.amazon.awssdk</groupId>
153+
<artifactId>sts</artifactId>
152154
<version>${aws.java.sdk.version}</version>
153155
</dependency>
156+
<dependency>
157+
<groupId>software.amazon.awssdk</groupId>
158+
<artifactId>s3</artifactId>
159+
<version>${aws.java.sdk.version}</version>
160+
</dependency>
161+
<!-- Hadoop -S3 requires this to be included -->
154162
<dependency>
155163
<groupId>com.amazonaws</groupId>
156164
<artifactId>aws-java-sdk-s3</artifactId>
157-
<version>${aws.java.sdk.version}</version>
165+
<version>${aws.java.sdk.v1.version}</version>
166+
<exclusions>
167+
<exclusion>
168+
<artifactId>commons-logging</artifactId>
169+
<groupId>commons-logging</groupId>
170+
</exclusion>
171+
</exclusions>
158172
</dependency>
159173
<dependency>
160174
<groupId>com.oracle.oci.sdk</groupId>

0 commit comments

Comments
 (0)