You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by db...@apache.org on 2015/03/13 23:02:10 UTC
bigtop git commit: BIGTOP-1756. Add HADOOP_MAPRED_HOME property to
common
Repository: bigtop
Updated Branches:
refs/heads/master 8aac1b774 -> fa7ce3977
BIGTOP-1756. Add HADOOP_MAPRED_HOME property to common
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/fa7ce397
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/fa7ce397
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/fa7ce397
Branch: refs/heads/master
Commit: fa7ce39778aee8ee546cd5b0e75cf98b16661f26
Parents: 8aac1b7
Author: Dasha <da...@wandisco.com>
Authored: Fri Mar 13 15:27:18 2015 -0700
Committer: Dasha <da...@wandisco.com>
Committed: Fri Mar 13 15:27:18 2015 -0700
----------------------------------------------------------------------
bigtop-tests/test-execution/common/pom.xml | 1 +
.../test-execution/smokes/crunch/pom.xml | 1 -
.../test-execution/smokes/datafu/pom.xml | 6 ------
.../test-execution/smokes/hadoop/pom.xml | 22 ++++++++++++++++++++
4 files changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fa7ce397/bigtop-tests/test-execution/common/pom.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-execution/common/pom.xml b/bigtop-tests/test-execution/common/pom.xml
index 279a125..d0b1b8b 100644
--- a/bigtop-tests/test-execution/common/pom.xml
+++ b/bigtop-tests/test-execution/common/pom.xml
@@ -45,6 +45,7 @@
These settings should be enforced at the top level
-->
<HADOOP_HOME>${env.HADOOP_HOME}</HADOOP_HOME>
+ <HADOOP_MAPRED_DIR>${env.HADOOP_MAPRED_DIR}</HADOOP_MAPRED_DIR>
<HADOOP_CONF_DIR>${env.HADOOP_CONF_DIR}</HADOOP_CONF_DIR>
<!--
Default exclude mask for failsafe plugin. OPTIONAL
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fa7ce397/bigtop-tests/test-execution/smokes/crunch/pom.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-execution/smokes/crunch/pom.xml b/bigtop-tests/test-execution/smokes/crunch/pom.xml
index bb94a37..aba2258 100644
--- a/bigtop-tests/test-execution/smokes/crunch/pom.xml
+++ b/bigtop-tests/test-execution/smokes/crunch/pom.xml
@@ -39,7 +39,6 @@
<org.apache.maven-dependency-plugin.type>jar</org.apache.maven-dependency-plugin.type>
<HADOOP_MAPRED_HOME>${env.HADOOP_MAPRED_HOME}</HADOOP_MAPRED_HOME>
- <HADOOP_CONF_DIR>${env.HADOOP_CONF_DIR}</HADOOP_CONF_DIR>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fa7ce397/bigtop-tests/test-execution/smokes/datafu/pom.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-execution/smokes/datafu/pom.xml b/bigtop-tests/test-execution/smokes/datafu/pom.xml
index 67c2823..1bc50aa 100644
--- a/bigtop-tests/test-execution/smokes/datafu/pom.xml
+++ b/bigtop-tests/test-execution/smokes/datafu/pom.xml
@@ -40,8 +40,6 @@
<org.apache.maven-dependency-plugin.type>jar</org.apache.maven-dependency-plugin.type>
<org.apache.maven-failsafe-plugin.testInclude>**/*Tests*</org.apache.maven-failsafe-plugin.testInclude>
- <HADOOP_MAPRED_HOME>${env.HADOOP_MAPRED_HOME}</HADOOP_MAPRED_HOME>
- <HADOOP_CONF_DIR>${env.HADOOP_CONF_DIR}</HADOOP_CONF_DIR>
<PIG_HOME>${env.PIG_HOME}</PIG_HOME>
</properties>
@@ -98,10 +96,6 @@
<message>HADOOP_MAPRED_HOME env. variable has to be set</message>
</requireProperty>
<requireProperty>
- <property>HADOOP_CONF_DIR</property>
- <message>HADOOP_CONF_DIR env. variable has to be set</message>
- </requireProperty>
- <requireProperty>
<property>PIG_HOME</property>
<message>PIG_HOME env. variable has to be set</message>
</requireProperty>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fa7ce397/bigtop-tests/test-execution/smokes/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-execution/smokes/hadoop/pom.xml b/bigtop-tests/test-execution/smokes/hadoop/pom.xml
index 8e456cb..3c1d7c6 100644
--- a/bigtop-tests/test-execution/smokes/hadoop/pom.xml
+++ b/bigtop-tests/test-execution/smokes/hadoop/pom.xml
@@ -71,6 +71,28 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>enforce-property</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>HADOOP_MAPRED_HOME</property>
+ <message>HADOOP_MAPRED_HOME env. variable has to be set</message>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>