Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,22 @@
<artifactId>discovery-server</artifactId>
<version>1.17</version>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.6.12</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
11 changes: 11 additions & 0 deletions presto-hive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,17 @@
<artifactId>joda-time</artifactId>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
</dependency>

<!-- should be scope test but is needed transitively -->
<dependency>
<groupId>io.airlift</groupId>
<artifactId>log-manager</artifactId>
</dependency>

<!-- for testing -->
<dependency>
<groupId>org.testng</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ protected Configuration createConfiguration()
config.setInt("ipc.client.connect.max.retries", dfsConnectMaxRetries);

// re-map filesystem schemes to match Amazon Elastic MapReduce
config.set("fs.s3.impl", "org.apache.hadoop.fs.s3native.NativeS3FileSystem");
config.set("fs.s3.impl", PrestoS3FileSystem.class.getName());
config.set("fs.s3n.impl", PrestoS3FileSystem.class.getName());
config.set("fs.s3bfs.impl", "org.apache.hadoop.fs.s3.S3FileSystem");

// set AWS credentials for S3
Expand Down
Loading