You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2013/04/05 23:02:59 UTC
git commit: BIGTOP-906. a few tests need artifacts compiled against
Hadoop 2.X
Updated Branches:
refs/heads/master edf58eca3 -> 8c15a1727
BIGTOP-906. a few tests need artifacts compiled against Hadoop 2.X
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8c15a172
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8c15a172
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8c15a172
Branch: refs/heads/master
Commit: 8c15a1727e5cf771d728a1bac1dd73008b6bfa2f
Parents: edf58ec
Author: Konstantin Boudnik <co...@apache.org>
Authored: Fri Apr 5 14:02:01 2013 -0700
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Fri Apr 5 14:02:46 2013 -0700
----------------------------------------------------------------------
bigtop-tests/test-execution/smokes/hbase/pom.xml | 31 ++++++++-
bigtop-tests/test-execution/smokes/pig/pom.xml | 67 +++++-----------
bigtop-tests/test-execution/smokes/pom.xml | 9 ++-
3 files changed, 58 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8c15a172/bigtop-tests/test-execution/smokes/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-execution/smokes/hbase/pom.xml b/bigtop-tests/test-execution/smokes/hbase/pom.xml
index 2a873e2..1bf96fc 100644
--- a/bigtop-tests/test-execution/smokes/hbase/pom.xml
+++ b/bigtop-tests/test-execution/smokes/hbase/pom.xml
@@ -59,11 +59,33 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <file>${HBASE_HOME}/${hbase.jar}</file>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ <packaging>jar</packaging>
+ <classifier>tests</classifier>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<id>enforce-property</id>
+ <phase>validate</phase>
<goals>
<goal>enforce</goal>
</goals>
@@ -115,7 +137,7 @@
<executions>
<execution>
<id>find-versioned-jar</id>
- <phase>pre-integration-test</phase>
+ <phase>validate</phase>
<goals>
<goal>execute</goal>
</goals>
@@ -134,6 +156,13 @@
if ( project.properties['hbase.jar'] == null ) {
throw new IOException ("hbase*.jar isn't found");
}
+
+ project.properties['hbase.tests.jar'] =
+ org.apache.bigtop.itest.JarContent.getJarName(
+ "${HBASE_HOME}", 'hbase-.*tests.jar');
+ if ( project.properties['hbase.tests.jar'] == null ) {
+ throw new IOException ("hbase*tests.jar isn't found");
+ }
}
</source>
</configuration>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8c15a172/bigtop-tests/test-execution/smokes/pig/pom.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-execution/smokes/pig/pom.xml b/bigtop-tests/test-execution/smokes/pig/pom.xml
index 4c7938c..0871e91 100644
--- a/bigtop-tests/test-execution/smokes/pig/pom.xml
+++ b/bigtop-tests/test-execution/smokes/pig/pom.xml
@@ -49,24 +49,11 @@
<dependencies>
<dependency>
<groupId>org.apache.pig</groupId>
- <artifactId>pig</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.pig</groupId>
<artifactId>pigsmoke</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop.version}</version>
+ <artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
@@ -84,6 +71,26 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <file>/usr/lib/pig/pig.jar</file>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>${pig.version}</version>
+ <packaging>jar</packaging>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.11</version>
<configuration>
@@ -93,42 +100,10 @@
<additionalClasspathElement>
${HADOOP_CONF_DIR}
</additionalClasspathElement>
- <additionalClasspathElement>
- <!-- the value of ${lzo.jar} property is set by a groovy
- script during pre-integration-test phase below-->
- ${HADOOP_HOME}/lib/${lzo.jar}
- </additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>find-lzo-jar</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>
- if (!System.getProperties().keySet().contains('enforcer.skip')) {
- project.properties['lzo.jar'] =
- org.apache.bigtop.itest.JarContent.getJarName(
- "${HADOOP_HOME}/lib", '.*hadoop.*lzo.*.jar');
- if ( project.properties['lzo.jar'] == null ) {
- throw new IOException ("hadoop-lzo.jar isn't found");
- }
- }
- </source>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8c15a172/bigtop-tests/test-execution/smokes/pom.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-execution/smokes/pom.xml b/bigtop-tests/test-execution/smokes/pom.xml
index dcc27b6..e534765 100644
--- a/bigtop-tests/test-execution/smokes/pom.xml
+++ b/bigtop-tests/test-execution/smokes/pom.xml
@@ -40,7 +40,7 @@
<hadoop.version>2.0.4-SNAPSHOT</hadoop.version>
<hbase.version>0.94.5</hbase.version>
<pig.version>0.11.0</pig.version>
- <pig-smoke.version>0.11.0-SNAPSHOT</pig-smoke.version>
+ <pig-smoke.version>0.11.1</pig-smoke.version>
<sqoop.version>1.99.1-incubating</sqoop.version>
<itest-conf.version>0.6.0-SNAPSHOT</itest-conf.version>
<itest-common.version>0.6.0-SNAPSHOT</itest-common.version>
@@ -123,6 +123,11 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common-test</artifactId>
<version>${hadoop.version}</version>
</dependency>
@@ -166,7 +171,7 @@
<dependency>
<groupId>org.apache.pig</groupId>
<artifactId>pigsmoke</artifactId>
- <version>${pig.version}</version>
+ <version>${pig-smoke.version}</version>
<scope>test</scope>
</dependency>
<!-- Test artifacts -->