Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml Mon Apr 16 16:10:22 2012 @@ -21,22 +21,22 @@ <parent> <groupId>org.apache.bigtop</groupId> <artifactId>bigtop</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>bigtop-smokes</artifactId> <packaging>pom</packaging> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>bigtop-smokes</name> <modules> <module>hadoop</module> - <module>hive</module> <module>package</module> <module>oozie</module> + <module>hive</module> <module>hbase</module> <module>flume</module> <module>sqoop</module> @@ -45,11 +45,11 @@ <properties> <junit.version>4.8.2</junit.version> - <itest-common.version>0.3.0-incubating-SNAPSHOT</itest-common.version> - <hadoop.version>0.20.205.0</hadoop.version> - <pig.version>0.9.1</pig.version> - <sqoop.version>1.3.0</sqoop.version> - <hbase.version>0.90.4</hbase.version> + <itest-common.version>0.4.0-incubating-SNAPSHOT</itest-common.version> + <hadoop.version>0.23.1</hadoop.version> + <pig.version>0.9.2</pig.version> + <sqoop.version>1.4.0-incubating</sqoop.version> + <hbase.version>0.92.0</hbase.version> </properties> <dependencyManagement> @@ -66,6 +66,28 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <type>test-jar</type> + <version>${hbase.version}</version> + </dependency> + <!-- + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> <version>${hadoop.version}</version> </dependency> @@ -85,6 +107,7 @@ <version>${hbase.version}</version> <type>test-jar</type> </dependency> + --> </dependencies> </dependencyManagement>
Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop-smokes/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop-smokes/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop-smokes/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop-smokes/pom.xml Mon Apr 16 16:10:22 2012 @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>bigtop-smokes</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>sqoopsmokes</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>sqoopsmokes</name> </project> Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/pom.xml Mon Apr 16 16:10:22 2012 @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>bigtop-smokes</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>sqoop-integration</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>sqoop-integration</name> </project> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/common/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/common/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/common/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/common/pom.xml Mon Apr 16 16:10:22 2012 @@ -24,14 +24,14 @@ <parent> <groupId>org.apache.bigtop</groupId> <artifactId>bigtop</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>stacks-common</artifactId> <packaging>pom</packaging> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>stacks-validation-common</name> <properties> @@ -117,7 +117,7 @@ <dependency> <groupId>org.apache.bigtop.itest</groupId> <artifactId>itest-common</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/conf/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/conf/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/conf/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/conf/pom.xml Mon Apr 16 16:10:22 2012 @@ -21,13 +21,13 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>stacks-common</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../common/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests-conf</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>smoke-tests-conf</name> <dependencies> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/integration/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/integration/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/integration/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/integration/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>stacks-common</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../common/pom.xml</relativePath> </parent> @@ -30,16 +30,16 @@ <groupId>org.apache.bigtop.itest</groupId> <artifactId>integration-tests</artifactId> <packaging>pom</packaging> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>hadoop-stack-integration</name> <properties> <!-- BOM definitions --> - <itest-conf.version>0.3.0-incubating-SNAPSHOT</itest-conf.version> - <itest-common.version>0.3.0-incubating-SNAPSHOT</itest-common.version> - <sqoop-integration.version>0.3.0-incubating-SNAPSHOT</sqoop-integration.version> + <itest-conf.version>0.4.0-incubating-SNAPSHOT</itest-conf.version> + <itest-common.version>0.4.0-incubating-SNAPSHOT</itest-common.version> + <sqoop-integration.version>0.4.0-incubating-SNAPSHOT</sqoop-integration.version> <!-- End of BOM definitions --> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/integration/sqoop/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/integration/sqoop/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/integration/sqoop/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/integration/sqoop/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>integration-tests</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.bigtop.itest</groupId> <artifactId>sqoop-integration-execution</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>sqoop-integration-execution</name> <properties> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/package/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/package/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/package/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/package/pom.xml Mon Apr 16 16:10:22 2012 @@ -23,13 +23,13 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../smokes/pom.xml</relativePath> </parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>package-smoke-execution</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>packagesmokes</name> <properties> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/pom.xml Mon Apr 16 16:10:22 2012 @@ -21,14 +21,14 @@ <parent> <groupId>org.apache.bigtop</groupId> <artifactId>bigtop</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>bigtop-test-execution</artifactId> <packaging>pom</packaging> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>bigtop-smokes</name> <modules> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/flume/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/flume/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/flume/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/flume/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.bigtop.itest</groupId> <artifactId>flume-smoke-execution</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>Flume smoke test execution</name> <properties> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml Mon Apr 16 16:10:22 2012 @@ -23,13 +23,13 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>hadoop-smoke-execution</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>Hadoop smoke test execution</name> <properties> @@ -55,7 +55,13 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop.version}</version> </dependency> <!-- explicit dependency is needed to pull down transient deps. such as hadoop-examples --> <dependency> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hbase/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hbase/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hbase/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hbase/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.bigtop.itest</groupId> <artifactId>hbase-smoke-execution</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>HBase smoke test execution</name> <properties> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hive/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hive/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hive/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hive/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.bigtop.itest</groupId> <artifactId>hive-smoke-execution</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>Hive smoke test execution</name> <properties> @@ -46,7 +46,7 @@ <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> + <artifactId>hadoop-common</artifactId> </dependency> <dependency> <groupId>org.apache.bigtop.itest</groupId> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/mahout/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/mahout/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/mahout/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/mahout/pom.xml Mon Apr 16 16:10:22 2012 @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>mahout-smoke-execution</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>Mahout smoke test execution</name> <properties> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/oozie/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/oozie/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/oozie/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/oozie/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.bigtop.itest</groupId> <artifactId>oozie-smoke-test</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>Oozie smoke test execution</name> <properties> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pig/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pig/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pig/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pig/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -30,7 +30,7 @@ <groupId>org.apache.bigtop.itest</groupId> <artifactId>pig-smoke-execution</artifactId> <packaging>jar</packaging> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>pigsmokes</name> <properties> @@ -55,7 +55,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> + <artifactId>hadoop-common</artifactId> </dependency> </dependencies> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>stacks-common</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../common/pom.xml</relativePath> </parent> @@ -30,7 +30,7 @@ <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests</artifactId> <packaging>pom</packaging> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>hadoop-stack-validation</name> <properties> @@ -41,15 +41,15 @@ <pig.version>0.9.2</pig.version> <pig-smoke.version>0.9.2-SNAPSHOT</pig-smoke.version> <sqoop.version>1.4.1-incubating</sqoop.version> - <itest-conf.version>0.3.0-incubating-SNAPSHOT</itest-conf.version> - <itest-common.version>0.3.0-incubating-SNAPSHOT</itest-common.version> - <hadoop-smoke.version>0.3.0-incubating-SNAPSHOT</hadoop-smoke.version> - <flume-smoke.version>0.3.0-incubating-SNAPSHOT</flume-smoke.version> - <hbase-smoke.version>0.3.0-incubating-SNAPSHOT</hbase-smoke.version> - <hive-smoke.version>0.3.0-incubating-SNAPSHOT</hive-smoke.version> - <mahout-smoke.version>0.3.0-incubating-SNAPSHOT</mahout-smoke.version> - <oozie-smoke.version>0.3.0-incubating-SNAPSHOT</oozie-smoke.version> - <package-smoke.version>0.3.0-incubating-SNAPSHOT</package-smoke.version> + <itest-conf.version>0.4.0-incubating-SNAPSHOT</itest-conf.version> + <itest-common.version>0.4.0-incubating-SNAPSHOT</itest-common.version> + <hadoop-smoke.version>0.4.0-incubating-SNAPSHOT</hadoop-smoke.version> + <flume-smoke.version>0.4.0-incubating-SNAPSHOT</flume-smoke.version> + <hbase-smoke.version>0.4.0-incubating-SNAPSHOT</hbase-smoke.version> + <hive-smoke.version>0.4.0-incubating-SNAPSHOT</hive-smoke.version> + <mahout-smoke.version>0.4.0-incubating-SNAPSHOT</mahout-smoke.version> + <oozie-smoke.version>0.4.0-incubating-SNAPSHOT</oozie-smoke.version> + <package-smoke.version>0.4.0-incubating-SNAPSHOT</package-smoke.version> <!-- End of BOM definitions --> @@ -59,14 +59,18 @@ List of modules which should be executed as a part of stack testing run --> <modules> + <!-- <module>pig</module> <module>hive</module> + --> <module>hadoop</module> + <!-- <module>oozie</module> <module>sqoop</module> <module>flume</module> <module>hbase</module> <module>mahout</module> + --> </modules> <dependencyManagement> @@ -104,17 +108,45 @@ BOM definitions --> <!-- Product artifacts --> + <!-- + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common-test</artifactId> + <version>${hadoop.version}</version> + </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> + <artifactId>hadoop-hdfs-test</artifactId> <version>${hadoop.version}</version> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapred</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <version>${hbase.version}</version> + <type>test-jar</type> + </dependency> + <dependency> <groupId>org.apache.pig</groupId> <artifactId>pig</artifactId> <version>${pig.version}</version> <scope>test</scope> </dependency> + --> <!-- Test artifacts --> <dependency> <groupId>org.apache.bigtop.itest</groupId> @@ -127,6 +159,7 @@ Same goes for the rest of the bunch here--> <scope>test</scope> </dependency> + <!-- <dependency> <groupId>org.apache.bigtop.itest</groupId> <artifactId>hbase-smoke</artifactId> @@ -169,7 +202,7 @@ <version>${sqoop.version}</version> <scope>test</scope> </dependency> - + --> <!-- End of BOM definitions --> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop-smokes/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop-smokes/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop-smokes/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop-smokes/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.bigtop.itest</groupId> <artifactId>sqoop-smoke-execution</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>Sqoop smoke test execution</name> <properties> @@ -38,7 +38,7 @@ <!-- Integration tests are special --> <org.apache.maven-dependency-plugin.groupId>org.apache.bigtop.itest</org.apache.maven-dependency-plugin.groupId> <org.apache.maven-dependency-plugin.artifactId>sqoopsmokes</org.apache.maven-dependency-plugin.artifactId> - <org.apache.maven-dependency-plugin.version>0.3.0-incubating-SNAPSHOT</org.apache.maven-dependency-plugin.version> + <org.apache.maven-dependency-plugin.version>0.4.0-incubating-SNAPSHOT</org.apache.maven-dependency-plugin.version> <org.apache.maven-dependency-plugin.type>jar</org.apache.maven-dependency-plugin.type> </properties> Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.bigtop.itest</groupId> <artifactId>smoke-tests</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.bigtop.itest</groupId> <artifactId>sqoop-test-execution</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <name>Sqoop smoke test execution</name> <properties> @@ -58,7 +58,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> + <artifactId>hadoop-common</artifactId> </dependency> <dependency> Modified: incubator/bigtop/trunk/bigtop.mk URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop.mk (original) +++ incubator/bigtop/trunk/bigtop.mk Mon Apr 16 16:10:22 2012 @@ -13,19 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -BIGTOP_VERSION=0.3.0-incubating +BIGTOP_VERSION=0.4.0-incubating # Hadoop 0.20.0-based hadoop package HADOOP_NAME=hadoop HADOOP_RELNOTES_NAME=Apache Hadoop -HADOOP_BASE_VERSION=1.0.1 -HADOOP_PKG_VERSION=$(HADOOP_BASE_VERSION) +HADOOP_BASE_VERSION=2.0.0-SNAPSHOT +HADOOP_PKG_VERSION=2.0.0 HADOOP_RELEASE_VERSION=1 HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz -HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST) -HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION) -HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH) -HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH) +#HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION) +#HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH) +#HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH) +HADOOP_TARBALL_SRC=8c0466d +HADOOP_SITE=https://github.com/apache/hadoop-common/tarball +HADOOP_ARCHIVE=$(HADOOP_SITE) $(eval $(call PACKAGE,hadoop,HADOOP)) # ZooKeeper @@ -124,7 +126,6 @@ WHIRR_TARBALL_SRC=$(WHIRR_TARBALL_DST) WHIRR_DOWNLOAD_PATH=/whirr/whirr-$(WHIRR_BASE_VERSION) WHIRR_SITE=$(APACHE_MIRROR)$(WHIRR_DOWNLOAD_PATH) WHIRR_ARCHIVE=$(APACHE_ARCHIVE)$(WHIRR_DOWNLOAD_PATH) - $(eval $(call PACKAGE,whirr,WHIRR)) # Mahout @@ -163,3 +164,27 @@ BIGTOP_UTILS_BASE_VERSION=$(subst -,.,$( BIGTOP_UTILS_PKG_VERSION=$(BIGTOP_UTILS_BASE_VERSION) BIGTOP_UTILS_RELEASE_VERSION=1 $(eval $(call PACKAGE,bigtop-utils,BIGTOP_UTILS)) + +# Bigtop-jsvc +BIGTOP_JSVC_NAME=bigtop-jsvc +BIGTOP_JSVC_RELNOTES_NAME=Apache Commons Daemon (jsvc) +BIGTOP_JSVC_PKG_NAME=bigtop-jsvc +BIGTOP_JSVC_BASE_VERSION=1.0.10 +BIGTOP_JSVC_PKG_VERSION=1.0.10 +BIGTOP_JSVC_RELEASE_VERSION=1 +BIGTOP_JSVC_TARBALL_SRC=commons-daemon-$(BIGTOP_JSVC_BASE_VERSION)-native-src.tar.gz +BIGTOP_JSVC_TARBALL_DST=commons-daemon-$(BIGTOP_JSVC_BASE_VERSION).tar.gz +BIGTOP_JSVC_SITE=$(APACHE_MIRROR)/commons/daemon/source/ +$(eval $(call PACKAGE,bigtop-jsvc,BIGTOP_JSVC)) + +# Bigtop-tomcat +BIGTOP_TOMCAT_NAME=bigtop-tomcat +BIGTOP_TOMCAT_RELNOTES_NAME=Apache Tomcat +BIGTOP_TOMCAT_PKG_NAME=bigtop-tomcat +BIGTOP_TOMCAT_BASE_VERSION=6.0.35 +BIGTOP_TOMCAT_PKG_VERSION=$(BIGTOP_TOMCAT_BASE_VERSION) +BIGTOP_TOMCAT_RELEASE_VERSION=1 +BIGTOP_TOMCAT_TARBALL_SRC=apache-tomcat-$(BIGTOP_TOMCAT_BASE_VERSION)-src.tar.gz +BIGTOP_TOMCAT_TARBALL_DST=apache-tomcat-$(BIGTOP_TOMCAT_BASE_VERSION).tar.gz +BIGTOP_TOMCAT_SITE=$(APACHE_MIRROR)/tomcat/tomcat-6/v$(BIGTOP_TOMCAT_BASE_VERSION)/src/ +$(eval $(call PACKAGE,bigtop-tomcat,BIGTOP_TOMCAT)) Modified: incubator/bigtop/trunk/package.mk URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/package.mk?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/package.mk (original) +++ incubator/bigtop/trunk/package.mk Mon Apr 16 16:10:22 2012 @@ -23,6 +23,27 @@ $(BUILD_DIR)/%/.download: [ -z "$($(PKG)_TARBALL_SRC)" -o -f $($(PKG)_DOWNLOAD_DST) ] || (cd $(DL_DIR) && curl --retry 5 -# -L -k -o $($(PKG)_TARBALL_DST) $($(PKG)_DOWNLOAD_URL)) touch $@ +# Untar and patch +$(BUILD_DIR)/%/.tar: + -rm -rf $(PKG_BUILD_DIR)/tar/ + mkdir -p $(PKG_BUILD_DIR)/tar/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) + if [ -n "$($(PKG)_TARBALL_SRC)" ]; then \ + cp $($(PKG)_DOWNLOAD_DST) $(PKG_BUILD_DIR)/tar/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz ;\ + tar -C $(PKG_BUILD_DIR)/tar/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) \ + --strip-components 1 -xzvf $(PKG_BUILD_DIR)/tar/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz; \ + fi + if [ -f $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/series ]; then \ + PATCHES="`cat $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/series`" ;\ + elif [ -f $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/patch ]; then \ + PATCHES="patch" ;\ + else \ + PATCHES="/dev/null" ;\ + fi ; (cd $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME); cat $$PATCHES)| \ + (cd $(PKG_BUILD_DIR)/tar/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) ; patch -p0) + tar -C $(PKG_BUILD_DIR)/tar -czf $(PKG_BUILD_DIR)/tar/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).patched.tar.gz \ + $($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) + touch $@ + # Make source RPMs $(BUILD_DIR)/%/.srpm: -rm -rf $(PKG_BUILD_DIR)/rpm/ @@ -105,6 +126,7 @@ $(BUILD_DIR)/%/.deb: --preserve-envvar JAVA5_HOME \ --preserve-envvar FORREST_HOME \ --preserve-envvar MAVEN3_HOME \ + --preserve-envvar MAVEN_OPTS \ --preserve-envvar JAVA_HOME \ --set-envvar=$(PKG)_BASE_VERSION=$($(PKG)_BASE_VERSION) \ --set-envvar=$(PKG)_VERSION=$($(PKG)_PKG_VERSION)$(BIGTOP_BUILD_STAMP) \ @@ -147,6 +169,7 @@ ifneq ($$(shell curl -o /dev/null --sile endif $(2)_TARGET_DL = $$($(2)_BUILD_DIR)/.download +$(2)_TARGET_TAR = $$($(2)_BUILD_DIR)/.tar $(2)_TARGET_SRPM = $$($(2)_BUILD_DIR)/.srpm $(2)_TARGET_RPM = $$($(2)_BUILD_DIR)/.rpm $(2)_TARGET_YUM = $$($(2)_BUILD_DIR)/.yum @@ -158,6 +181,9 @@ $(2)_TARGET_RELNOTES = $$($(2)_BUILD_DIR # We download target when the source is not in the download directory $(1)-download: $$($(2)_TARGET_DL) +# Make a patched tarball (patch could be null) +$(1)-tar: $(1)-download $$($(2)_TARGET_TAR) + # To make srpms, we need to build the package $(1)-srpm: $(1)-download $$($(2)_TARGET_SRPM) @@ -209,11 +235,11 @@ $(1)-info: # Implicit rules with PKG variable $$($(2)_TARGET_DL): PKG=$(2) -$$($(2)_TARGET_APT) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG=$(2) -$$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_BASE_VERSION=$$($(2)_BASE_VERSION) -$$($(2)_TARGET_APT) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_PKG_VERSION=$$($(2)_PKG_VERSION) -$$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_SOURCE_DIR=$$($(2)_SOURCE_DIR) -$$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_BUILD_DIR=$$($(2)_BUILD_DIR) +$$($(2)_TARGET_TAR) $$($(2)_TARGET_APT) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG=$(2) +$$($(2)_TARGET_TAR) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_BASE_VERSION=$$($(2)_BASE_VERSION) +$$($(2)_TARGET_TAR) $$($(2)_TARGET_APT) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_PKG_VERSION=$$($(2)_PKG_VERSION) +$$($(2)_TARGET_TAR) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_SOURCE_DIR=$$($(2)_SOURCE_DIR) +$$($(2)_TARGET_TAR) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_BUILD_DIR=$$($(2)_BUILD_DIR) TARGETS += $(1) Modified: incubator/bigtop/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/pom.xml (original) +++ incubator/bigtop/trunk/pom.xml Mon Apr 16 16:10:22 2012 @@ -27,7 +27,7 @@ <groupId>org.apache.bigtop</groupId> <artifactId>bigtop</artifactId> - <version>0.3.0-incubating-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <packaging>pom</packaging> <name>Bigtop</name>
