Fixing sloppy enforcer's rules that should've been there in the first place


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c5e33e2b
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c5e33e2b
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c5e33e2b

Branch: refs/heads/master
Commit: c5e33e2b5dc9a398d53cb10ebea549d55873fded
Parents: b9ca452
Author: Konstantin Boudnik <[email protected]>
Authored: Thu Feb 6 18:42:17 2014 -0800
Committer: Konstantin Boudnik <[email protected]>
Committed: Thu Feb 6 20:57:58 2014 -0800

----------------------------------------------------------------------
 .../test-execution/longevity/io/pom.xml         | 40 ++------------------
 1 file changed, 3 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/c5e33e2b/bigtop-tests/test-execution/longevity/io/pom.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-execution/longevity/io/pom.xml 
b/bigtop-tests/test-execution/longevity/io/pom.xml
index fa60730..d86dcdf 100644
--- a/bigtop-tests/test-execution/longevity/io/pom.xml
+++ b/bigtop-tests/test-execution/longevity/io/pom.xml
@@ -37,16 +37,18 @@
     <HADOOP_HOME>${env.HADOOP_HOME}</HADOOP_HOME>
     <HADOOP_CONF_DIR>${env.HADOOP_CONF_DIR}</HADOOP_CONF_DIR>
     <!-- Integration tests are special -->
-    
<org.apache.maven-failsafe-plugin.testInclude>**/LongevityTest*</org.apache.maven-failsafe-plugin.testInclude>
+    
<org.apache.maven-failsafe-plugin.testInclude>**/Test*</org.apache.maven-failsafe-plugin.testInclude>
     
<org.apache.maven-dependency-plugin.groupId>org.apache.bigtop.itest</org.apache.maven-dependency-plugin.groupId>
     
<org.apache.maven-dependency-plugin.artifactId>io-longevity</org.apache.maven-dependency-plugin.artifactId>
     
<org.apache.maven-dependency-plugin.version>${io-longevity.version}</org.apache.maven-dependency-plugin.version>
+    
<org.apache.maven-dependency-plugin.type>jar</org.apache.maven-dependency-plugin.type>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.bigtop.itest</groupId>
       <artifactId>io-longevity</artifactId>
+      <version>${org.apache.maven-dependency-plugin.version}</version>
     </dependency>
   </dependencies>
 
@@ -60,47 +62,11 @@
       <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>SQOOP_HOME</property>
-                  <message>SQOOP_HOME env. variable has to be set</message>
-                </requireProperty>
-                <requireProperty>
-                  <property>HBASE_HOME</property>
-                  <message>HBASE_HOME env. variable has to be set</message>
-                </requireProperty>
-                <requireProperty>
-                  <property>HIVE_HOME</property>
-                  <message>HIVE_HOME env. variable has to be set</message>
-                </requireProperty>
-                <requireProperty>
-                  <property>ZOOKEEPER_HOME</property>
-                  <message>ZOOKEEPER_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-failsafe-plugin</artifactId>
-        <version>2.11</version>
-        <configuration>
-          <systemPropertyVariables>
-            <MYSQL_ROOTPW></MYSQL_ROOTPW>
-          </systemPropertyVariables>
-        </configuration>
       </plugin>
     </plugins>
   </build>

Reply via email to