sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jar...@apache.org
Subject sqoop git commit: SQOOP-1694: Sqoop2: Fix broken Hadoop100 build
Date Sun, 09 Nov 2014 04:53:46 GMT
Repository: sqoop
Updated Branches:
  refs/heads/sqoop2 b6b5b9d2f -> 7a642cea8


SQOOP-1694: Sqoop2: Fix broken Hadoop100 build

(Gwen Shapira via Jarek Jarcec Cecho)


Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/7a642cea
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/7a642cea
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/7a642cea

Branch: refs/heads/sqoop2
Commit: 7a642cea83d55fa5a53ec28599a030bbf8822ae6
Parents: b6b5b9d
Author: Jarek Jarcec Cecho <jarcec@apache.org>
Authored: Sat Nov 8 20:53:08 2014 -0800
Committer: Jarek Jarcec Cecho <jarcec@apache.org>
Committed: Sat Nov 8 20:53:08 2014 -0800

----------------------------------------------------------------------
 CHANGELOG.txt                    |  2 +
 connector/connector-hdfs/pom.xml | 88 +++++++++++++++++++++++++++--------
 2 files changed, 70 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sqoop/blob/7a642cea/CHANGELOG.txt
----------------------------------------------------------------------
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 539bd17..1a162ab 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -140,6 +140,8 @@ Release 1.99.4
 
     SQOOP-1679  Sqoop2: Fix inconsistent naming in shell for entity driver in sqoop2
 
+    SQOOP-1694  Sqoop2: Fix broken Hadoop100 build
+
   TASK
 
     SQOOP-1219  Sqoop2: Bump up Tomcat version to 6.0.37

http://git-wip-us.apache.org/repos/asf/sqoop/blob/7a642cea/connector/connector-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/connector/connector-hdfs/pom.xml b/connector/connector-hdfs/pom.xml
index fa4330a..8b1e11f 100644
--- a/connector/connector-hdfs/pom.xml
+++ b/connector/connector-hdfs/pom.xml
@@ -31,8 +31,6 @@ limitations under the License.
   <artifactId>sqoop-connector-hdfs</artifactId>
   <name>Sqoop HDFS Connector</name>
 
-  <!-- TODO: Hardcoding Hadoop200 for now -->
-
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -49,24 +47,6 @@ limitations under the License.
       <artifactId>connector-sdk</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-mapreduce-client-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
   </dependencies>
   <build>
     <finalName>sqoop</finalName>
@@ -85,4 +65,72 @@ limitations under the License.
     </plugins>
   </build>
 
+  <!-- Profiles for various supported Hadoop distributions -->
+  <profiles>
+
+    <!-- Hadoop 1.x -->
+    <profile>
+      <id>hadoop100</id>
+
+      <activation>
+        <property>
+          <name>hadoop.profile</name>
+          <value>100</value>
+        </property>
+      </activation>
+
+      <dependencies>
+        <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-core</artifactId>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <!-- Hadoop 2.x (active by default) -->
+    <profile>
+      <id>hadoop200</id>
+
+      <activation>
+        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>hadoop.profile</name>
+          <value>200</value>
+        </property>
+      </activation>
+
+      <properties>
+        <hadoop.profile>200</hadoop.profile>
+      </properties>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-common</artifactId>
+          <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-core</artifactId>
+          <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+          <scope>provided</scope>
+        </dependency>
+
+      </dependencies>
+    </profile>
+  </profiles>
+
+
 </project>
\ No newline at end of file


Mime
View raw message