asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mb...@apache.org
Subject asterixdb git commit: Localize asterix-installer failsafe excludes
Date Fri, 16 Jun 2017 00:28:59 GMT
Repository: asterixdb
Updated Branches:
  refs/heads/master 455405a4f -> a21388e0f


Localize asterix-installer failsafe excludes

Ensure no other modules are affected by asterix-installer failsafe
exclusions by locating the exclusions to the asterix-installer module

Change-Id: I44cb8f29d8d8e7c1e9e394be4ec8d9f41e7b8a44
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1841
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
BAD: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <tillw@apache.org>


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

Branch: refs/heads/master
Commit: a21388e0f94669a672bcfe3f069a9b49e26509c4
Parents: 455405a
Author: Michael Blow <mblow@apache.org>
Authored: Thu Jun 15 14:25:47 2017 -0400
Committer: Michael Blow <mblow@apache.org>
Committed: Thu Jun 15 17:28:41 2017 -0700

----------------------------------------------------------------------
 asterixdb/asterix-installer/pom.xml | 15 +++++++++++++++
 asterixdb/pom.xml                   |  9 ---------
 2 files changed, 15 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a21388e0/asterixdb/asterix-installer/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-installer/pom.xml b/asterixdb/asterix-installer/pom.xml
index ff4036c..344180e 100644
--- a/asterixdb/asterix-installer/pom.xml
+++ b/asterixdb/asterix-installer/pom.xml
@@ -27,6 +27,10 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
+
+    <failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes>
+    <cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes>
+    <cluster.extest.excludes>**/ClusterExecutionIT.java</cluster.extest.excludes>
   </properties>
 
   <licenses>
@@ -307,6 +311,17 @@
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <configuration>
+          <excludes combine.children="append">
+            <exclude>${failsafe.test.excludes}</exclude>
+            <exclude>${cluster.test.excludes}</exclude>
+            <exclude>${cluster.extest.excludes}</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a21388e0/asterixdb/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index b708187..e49f9aa 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -58,10 +58,6 @@
     <global.test.includes>**/*TestSuite.java,**/*Test.java</global.test.includes>
     <global.test.excludes>${invalid.tests},${repeated.tests}</global.test.excludes>
 
-    <failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes>
-    <cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes>
-    <cluster.extest.excludes>**/ClusterExecutionIT.java</cluster.extest.excludes>
-
     <!-- Versions under dependencymanagement or used in many projects via properties -->
     <algebricks.version>0.3.2-SNAPSHOT</algebricks.version>
     <hyracks.version>0.3.2-SNAPSHOT</hyracks.version>
@@ -117,11 +113,6 @@
           <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
           <argLine>${coverageArgLine}</argLine>
-          <excludes>
-            <exclude>${failsafe.test.excludes}</exclude>
-            <exclude>${cluster.test.excludes}</exclude>
-            <exclude>${cluster.extest.excludes}</exclude>
-          </excludes>
         </configuration>
         <executions>
           <execution>


Mime
View raw message