|
31 | 31 | <name>Drill : Packaging and Distribution Assembly</name> |
32 | 32 |
|
33 | 33 | <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> |
35 | 37 | <oci.hdfs.version>3.3.1.0.3.6</oci.hdfs.version> |
36 | 38 | </properties> |
37 | 39 |
|
|
131 | 133 | </exclusions> |
132 | 134 | </dependency> |
133 | 135 | <dependency> |
134 | | - <groupId>com.amazonaws</groupId> |
135 | | - <artifactId>aws-java-sdk-core</artifactId> |
| 136 | + <groupId>software.amazon.awssdk</groupId> |
| 137 | + <artifactId>aws-core</artifactId> |
136 | 138 | <version>${aws.java.sdk.version}</version> |
137 | 139 | <exclusions> |
138 | 140 | <exclusion> |
|
142 | 144 | </exclusions> |
143 | 145 | </dependency> |
144 | 146 | <dependency> |
145 | | - <groupId>com.amazonaws</groupId> |
146 | | - <artifactId>aws-java-sdk-dynamodb</artifactId> |
| 147 | + <groupId>software.amazon.awssdk</groupId> |
| 148 | + <artifactId>dynamodb</artifactId> |
147 | 149 | <version>${aws.java.sdk.version}</version> |
148 | 150 | </dependency> |
149 | 151 | <dependency> |
150 | | - <groupId>com.amazonaws</groupId> |
151 | | - <artifactId>aws-java-sdk-sts</artifactId> |
| 152 | + <groupId>software.amazon.awssdk</groupId> |
| 153 | + <artifactId>sts</artifactId> |
152 | 154 | <version>${aws.java.sdk.version}</version> |
153 | 155 | </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 --> |
154 | 162 | <dependency> |
155 | 163 | <groupId>com.amazonaws</groupId> |
156 | 164 | <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> |
158 | 172 | </dependency> |
159 | 173 | <dependency> |
160 | 174 | <groupId>com.oracle.oci.sdk</groupId> |
|
0 commit comments