Repository: bigtop Updated Branches: refs/heads/master fa7ce3977 -> b7f4a1b57
Revert "BIGTOP-1756. Add HADOOP_MAPRED_HOME property to common" This reverts commit fa7ce39778aee8ee546cd5b0e75cf98b16661f26. Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b7f4a1b5 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b7f4a1b5 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b7f4a1b5 Branch: refs/heads/master Commit: b7f4a1b57bb3cee787ce8735ebaa367db2e89319 Parents: fa7ce39 Author: Dasha <[email protected]> Authored: Fri Mar 13 16:27:28 2015 -0700 Committer: Dasha <[email protected]> Committed: Fri Mar 13 16:27:28 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, 7 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/b7f4a1b5/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 d0b1b8b..279a125 100644 --- a/bigtop-tests/test-execution/common/pom.xml +++ b/bigtop-tests/test-execution/common/pom.xml @@ -45,7 +45,6 @@ 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/b7f4a1b5/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 aba2258..bb94a37 100644 --- a/bigtop-tests/test-execution/smokes/crunch/pom.xml +++ b/bigtop-tests/test-execution/smokes/crunch/pom.xml @@ -39,6 +39,7 @@ <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/b7f4a1b5/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 1bc50aa..67c2823 100644 --- a/bigtop-tests/test-execution/smokes/datafu/pom.xml +++ b/bigtop-tests/test-execution/smokes/datafu/pom.xml @@ -40,6 +40,8 @@ <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> @@ -96,6 +98,10 @@ <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/b7f4a1b5/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 3c1d7c6..8e456cb 100644 --- a/bigtop-tests/test-execution/smokes/hadoop/pom.xml +++ b/bigtop-tests/test-execution/smokes/hadoop/pom.xml @@ -71,28 +71,6 @@ <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>
