Repository: sqoop Updated Branches: refs/heads/sqoop2 4570b05f8 -> 26164d8f7
SQOOP-1592: Sqoop2: Remove Hadoop1 profile (Abraham Elmahrek 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/26164d8f Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/26164d8f Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/26164d8f Branch: refs/heads/sqoop2 Commit: 26164d8f7c9acb282a64aeace3fcce3cedec1400 Parents: 4570b05 Author: Jarek Jarcec Cecho <[email protected]> Authored: Mon Feb 9 11:42:24 2015 -0800 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Mon Feb 9 11:42:24 2015 -0800 ---------------------------------------------------------------------- common/pom.xml | 82 +++++-------------- connector/connector-hdfs/pom.xml | 87 ++++---------------- dist/pom.xml | 76 ++++++----------- docs/src/site/sphinx/BuildingSqoop2.rst | 6 +- execution/mapreduce/pom.xml | 89 ++++---------------- pom.xml | 118 ++++++--------------------- security/pom.xml | 55 ++----------- server/pom.xml | 56 ++----------- submission/mapreduce/pom.xml | 71 +++------------- test/pom.xml | 108 +++++------------------- 10 files changed, 156 insertions(+), 592 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/26164d8f/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index af0a404..9e593b2 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -36,15 +36,36 @@ limitations under the License. <groupId>org.apache.sqoop</groupId> <artifactId>sqoop-common-test</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> + <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> @@ -111,66 +132,5 @@ limitations under the License. </plugin> </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>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> http://git-wip-us.apache.org/repos/asf/sqoop/blob/26164d8f/connector/connector-hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/connector/connector-hdfs/pom.xml b/connector/connector-hdfs/pom.xml index dff6f5f..512b54c 100644 --- a/connector/connector-hdfs/pom.xml +++ b/connector/connector-hdfs/pom.xml @@ -42,7 +42,25 @@ 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> <plugins> @@ -59,73 +77,4 @@ limitations under the License. </plugin> </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 http://git-wip-us.apache.org/repos/asf/sqoop/blob/26164d8f/dist/pom.xml ---------------------------------------------------------------------- diff --git a/dist/pom.xml b/dist/pom.xml index 1c303a9..e0bf0d0 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -32,6 +32,10 @@ limitations under the License. <name>Sqoop Distribution</name> <packaging>pom</packaging> + <properties> + <hadoop.version>200</hadoop.version> + </properties> + <dependencies> <dependency> <groupId>org.apache.sqoop</groupId> @@ -128,14 +132,14 @@ limitations under the License. <configuration> <target> <!-- Clean up --> - <delete dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}"/> - <delete file="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}.tar.gz"/> + <delete dir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}"/> + <delete file="target/sqoop-${project.version}-bin-hadoop${hadoop.version}.tar.gz"/> <!-- Create dist dir --> - <mkdir dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}"/> + <mkdir dir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}"/> <!-- Copy sources over --> - <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}" includeEmptyDirs="false" flatten="false"> + <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}" includeEmptyDirs="false" flatten="false"> <fileset dir="../"> <include name="**/*" /> <exclude name="build/**" /> @@ -149,7 +153,7 @@ limitations under the License. </copy> <!-- Copy generated documentation --> - <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/docs" includeEmptyDirs="false" flatten="false"> + <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/docs" includeEmptyDirs="false" flatten="false"> <fileset dir="../docs/target/site"> <include name="**/*" /> </fileset> @@ -159,26 +163,26 @@ limitations under the License. <get src="http://archive.apache.org/dist/tomcat/tomcat-${tomcat.major.version}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz"; dest="target/apache-tomcat.tar.gz" verbose="true" skipexisting="true"/> <untar src="target/apache-tomcat.tar.gz" dest="target" compression="gzip"/> - <move file="target/apache-tomcat-${tomcat.version}" tofile="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server"/> - <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/bin"> + <move file="target/apache-tomcat-${tomcat.version}" tofile="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/server"/> + <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/server/bin"> <fileset dir="src/main/server/bin"/> </copy> - <chmod dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/bin" perm="u+x" includes="**/*.sh"/> - <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/conf"> + <chmod dir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/server/bin" perm="u+x" includes="**/*.sh"/> + <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/server/conf"> <fileset dir="src/main/server/conf"/> </copy> - <delete dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/webapps"/> - <mkdir dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/webapps"/> - <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/webapps"> + <delete dir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/server/webapps"/> + <mkdir dir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/server/webapps"/> + <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/server/webapps"> <fileset dir="src/main/server/webapps"/> </copy> <copy file="../server/target/sqoop.war" - toDir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/webapps"/> + toDir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/server/webapps"/> <copy file="../tomcat/target/sqoop-tomcat-${project.version}.jar" - toDir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/lib"/> + toDir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/server/lib"/> <!-- Build shell client directory --> - <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/shell/lib"> + <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/shell/lib"> <fileset dir="../shell/target/lib"> <include name="*.jar" /> <exclude name="junit-*.jar" /> @@ -186,20 +190,20 @@ limitations under the License. </fileset> </copy> <copy file="../shell/target/sqoop-shell-${project.version}.jar" - toDir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/shell/lib"/> + toDir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/shell/lib"/> <!-- Build "bin" directory --> - <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/bin"> + <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/bin"> <fileset dir="src/main/bin"/> </copy> - <chmod dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/bin" perm="u+x" includes="*"/> + <chmod dir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}/bin" perm="u+x" includes="*"/> <!-- Finally create distribution tar --> - <tar destfile="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}.tar.gz" compression="gzip"> - <tarfileset dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}" prefix="sqoop-${project.version}-bin-hadoop${hadoop.profile}" filemode="755"> + <tar destfile="target/sqoop-${project.version}-bin-hadoop${hadoop.version}.tar.gz" compression="gzip"> + <tarfileset dir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}" prefix="sqoop-${project.version}-bin-hadoop${hadoop.version}" filemode="755"> <include name="**/*.sh" /> </tarfileset> - <tarfileset dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}" prefix="sqoop-${project.version}-bin-hadoop${hadoop.profile}"> + <tarfileset dir="target/sqoop-${project.version}-bin-hadoop${hadoop.version}" prefix="sqoop-${project.version}-bin-hadoop${hadoop.version}"> <include name="**/*" /> <exclude name="**/*.sh" /> </tarfileset> @@ -212,36 +216,6 @@ limitations under the License. </plugins> </build> </profile> - - <!-- Hadoop 1.x --> - <profile> - <id>hadoop100</id> - - <activation> - <property> - <name>hadoop.profile</name> - <value>100</value> - </property> - </activation> - </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> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/sqoop/blob/26164d8f/docs/src/site/sphinx/BuildingSqoop2.rst ---------------------------------------------------------------------- diff --git a/docs/src/site/sphinx/BuildingSqoop2.rst b/docs/src/site/sphinx/BuildingSqoop2.rst index 35b22d4..7fbbb6b 100644 --- a/docs/src/site/sphinx/BuildingSqoop2.rst +++ b/docs/src/site/sphinx/BuildingSqoop2.rst @@ -39,13 +39,13 @@ Sqoop2 is currently developed in special branch ``sqoop2`` that you need to chec Building project ---------------- -You can use usual maven targets like ``compile`` or ``package`` to build the project. Sqoop supports two major Hadoop revisions at the moment - 1.x and 2.x. As compiled code for one Hadoop major version can't be used on another, you must compile Sqoop against appropriate Hadoop version. You can change the target Hadoop version by specifying ``-Dhadoop.profile=$hadoopVersion`` on the maven command line. Possible values of ``$hadoopVersions`` are 100 and 200 for Hadoop version 1.x and 2.x respectively. Sqoop will compile against Hadoop 2 by default. Following example will compile Sqoop against Hadoop 1.x: +You can use usual maven targets like ``compile`` or ``package`` to build the project. Sqoop supports one major Hadoop revision at the moment - 2.x. As compiled code for one Hadoop major version can't be used on another, you must compile Sqoop against appropriate Hadoop version. :: - mvn compile -Dhadoop.profile=100 + mvn compile -Maven target ``package`` can be used to create Sqoop packages similar to the ones that are officially available for download. Sqoop will build only source tarball by default. You need to specify ``-Pbinary`` to build binary distribution. You might need to explicitly specify Hadoop version if the default is not accurate. +Maven target ``package`` can be used to create Sqoop packages similar to the ones that are officially available for download. Sqoop will build only source tarball by default. You need to specify ``-Pbinary`` to build binary distribution. :: http://git-wip-us.apache.org/repos/asf/sqoop/blob/26164d8f/execution/mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/execution/mapreduce/pom.xml b/execution/mapreduce/pom.xml index 7b9eaa0..3ad8d10 100644 --- a/execution/mapreduce/pom.xml +++ b/execution/mapreduce/pom.xml @@ -35,6 +35,24 @@ limitations under the License. </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> + + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <scope>test</scope> @@ -72,9 +90,6 @@ limitations under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>2.4</version> - <configuration> - <classifier>hadoop${hadoop.profile}</classifier> - </configuration> </plugin> <!-- @@ -92,72 +107,4 @@ 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> http://git-wip-us.apache.org/repos/asf/sqoop/blob/26164d8f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 829255c..d48389e 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,6 @@ limitations under the License. <commons-compress.version>1.9</commons-compress.version> <commons-codec.version>1.9</commons-codec.version> <derby.version>10.8.2.2</derby.version> - <hadoop.1.version>1.0.3</hadoop.1.version> <hadoop.2.version>2.6.0</hadoop.2.version> <guava.version>11.0.2</guava.version> <json-simple.version>1.1</json-simple.version> @@ -193,96 +192,6 @@ limitations under the License. </build> </profile> - <!-- Hadoop 1.x --> - <profile> - <id>hadoop100</id> - - <activation> - <property> - <name>hadoop.profile</name> - <value>100</value> - </property> - </activation> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons-io.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>${hadoop.1.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <version>${hadoop.1.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.1.version}</version> - </dependency> - - </dependencies> - </dependencyManagement> - </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> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.2.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${hadoop.2.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.2.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>${hadoop.2.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - </profile> - <!-- Sign profile for releasing artifacts to Nexus repository --> <profile> <id>sign</id> @@ -430,6 +339,31 @@ limitations under the License. <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop.2.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-jobclient</artifactId> + <version>${hadoop.2.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.2.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + <version>${hadoop.2.version}</version> + </dependency> + <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> <version>${json-simple.version}</version> @@ -448,13 +382,11 @@ limitations under the License. <groupId>org.apache.sqoop.submission</groupId> <artifactId>sqoop-submission-mapreduce</artifactId> <version>${project.version}</version> - <classifier>hadoop${hadoop.profile}</classifier> </dependency> <dependency> <groupId>org.apache.sqoop.execution</groupId> <artifactId>sqoop-execution-mapreduce</artifactId> <version>${project.version}</version> - <classifier>hadoop${hadoop.profile}</classifier> </dependency> <dependency> <groupId>commons-dbcp</groupId> http://git-wip-us.apache.org/repos/asf/sqoop/blob/26164d8f/security/pom.xml ---------------------------------------------------------------------- diff --git a/security/pom.xml b/security/pom.xml index 6ec4994..e4e61cc 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -33,54 +33,11 @@ limitations under the License. <groupId>org.apache.sqoop</groupId> <artifactId>sqoop-core</artifactId> </dependency> - </dependencies> - - <!-- 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>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> - </dependencies> - </profile> - </profiles> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/sqoop/blob/26164d8f/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 5a35bf3..ee409cb 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -56,7 +56,6 @@ limitations under the License. <dependency> <groupId>org.apache.sqoop.submission</groupId> <artifactId>sqoop-submission-mapreduce</artifactId> - <classifier>hadoop${hadoop.profile}</classifier> </dependency> <dependency> @@ -94,6 +93,12 @@ limitations under the License. <artifactId>sqoop-connector-kafka</artifactId> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>provided</scope> + </dependency> + <!-- <dependency> <groupId>org.apache.sqoop.connector</groupId> @@ -114,55 +119,6 @@ limitations under the License. </dependency> </dependencies> - <!-- 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>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> - </dependencies> - </profile> - </profiles> - <build> <finalName>sqoop</finalName> </build> http://git-wip-us.apache.org/repos/asf/sqoop/blob/26164d8f/submission/mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/submission/mapreduce/pom.xml b/submission/mapreduce/pom.xml index b0fbb71..f56437b 100644 --- a/submission/mapreduce/pom.xml +++ b/submission/mapreduce/pom.xml @@ -37,7 +37,18 @@ limitations under the License. <dependency> <groupId>org.apache.sqoop.execution</groupId> <artifactId>sqoop-execution-mapreduce</artifactId> - <classifier>hadoop${hadoop.profile}</classifier> + </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> @@ -64,66 +75,8 @@ limitations under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>2.4</version> - <configuration> - <classifier>hadoop${hadoop.profile}</classifier> - </configuration> </plugin> </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>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> - </dependencies> - </profile> - </profiles> - </project> http://git-wip-us.apache.org/repos/asf/sqoop/blob/26164d8f/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index 373b89c..f743d25 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -53,13 +53,11 @@ limitations under the License. <dependency> <groupId>org.apache.sqoop.execution</groupId> <artifactId>sqoop-execution-mapreduce</artifactId> - <classifier>hadoop${hadoop.profile}</classifier> </dependency> <dependency> <groupId>org.apache.sqoop.submission</groupId> <artifactId>sqoop-submission-mapreduce</artifactId> - <classifier>hadoop${hadoop.profile}</classifier> </dependency> <dependency> @@ -93,6 +91,28 @@ limitations under the License. </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> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + </dependency> + + <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-container-tomcat</artifactId> </dependency> @@ -136,9 +156,6 @@ limitations under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>2.4</version> - <configuration> - <classifier>hadoop${hadoop.profile}</classifier> - </configuration> </plugin> <!-- @@ -180,87 +197,6 @@ limitations under the License. <!-- 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>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - </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-mapreduce-client-core</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - </dependency> - - </dependencies> - - </profile> - <!-- Special JDBC Drivers --> <!--
