drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jacq...@apache.org
Subject [2/3] drill git commit: DRILL-4063: Add s3a dependency jars and example core-site.xml
Date Wed, 18 Nov 2015 05:59:57 GMT
DRILL-4063: Add s3a dependency jars and example core-site.xml


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/2b82a776
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/2b82a776
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/2b82a776

Branch: refs/heads/1.3.0
Commit: 2b82a77693a28b8c76959e7a807bc7a501a6efc5
Parents: a289668
Author: Abhi P <abhijit@dremio.com>
Authored: Tue Nov 17 19:04:23 2015 -0800
Committer: Jacques Nadeau <jacques@apache.org>
Committed: Tue Nov 17 19:32:13 2015 -0800

----------------------------------------------------------------------
 distribution/pom.xml                     |  5 +++++
 distribution/src/assemble/bin.xml        |  4 ++++
 distribution/src/resources/core-site.xml | 31 +++++++++++++++++++++++++++
 pom.xml                                  | 12 +++++++++++
 4 files changed, 52 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/2b82a776/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 896a6fc..c48741e 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -50,6 +50,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-aws</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/drill/blob/2b82a776/distribution/src/assemble/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml
index acdeefd..15f04a1 100644
--- a/distribution/src/assemble/bin.xml
+++ b/distribution/src/assemble/bin.xml
@@ -302,5 +302,9 @@
       <source>src/resources/drill-override-example.conf</source>
       <outputDirectory>conf</outputDirectory>
     </file>
+    <file>
+      <source>src/resources/core-site.xml</source>
+      <outputDirectory>conf</outputDirectory>
+    </file>
   </files>
 </assembly>

http://git-wip-us.apache.org/repos/asf/drill/blob/2b82a776/distribution/src/resources/core-site.xml
----------------------------------------------------------------------
diff --git a/distribution/src/resources/core-site.xml b/distribution/src/resources/core-site.xml
new file mode 100644
index 0000000..8a2ebe5
--- /dev/null
+++ b/distribution/src/resources/core-site.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration>
+
+    <property>
+        <name>fs.s3a.access.key</name>
+        <value>ENTER_YOUR_ACCESSKEY</value>
+    </property>
+
+    <property>
+        <name>fs.s3a.secret.key</name>
+        <value>ENTER_YOUR_SECRETKEY</value>
+    </property>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/drill/blob/2b82a776/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1dde3ad..769e225 100644
--- a/pom.xml
+++ b/pom.xml
@@ -591,6 +591,18 @@
     <dependencies>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-aws</artifactId>
+        <version>${hadoop.version}</version>
+        <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-yarn-api</artifactId>
         <version>${hadoop.version}</version>
         <scope>test</scope>


Mime
View raw message