You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2019/02/23 02:39:51 UTC

[bigtop] branch master updated: BIGTOP-3158. [Test] Fix test specification with maven failsafe plugin (#465)

This is an automated email from the ASF dual-hosted git repository.

evansye pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 163fcc2  BIGTOP-3158. [Test] Fix test specification with maven failsafe plugin (#465)
163fcc2 is described below

commit 163fcc2fddb73f3d6b8b652bf60903dcfc5e4200
Author: Evans Ye <ev...@apache.org>
AuthorDate: Sat Feb 23 10:39:47 2019 +0800

    BIGTOP-3158. [Test] Fix test specification with maven failsafe plugin (#465)
---
 bigtop-test-framework/pom.xml                         | 2 +-
 bigtop-tests/test-artifacts/pom.xml                   | 2 +-
 bigtop-tests/test-execution/common/pom.xml            | 2 +-
 bigtop-tests/test-execution/integration/pom.xml       | 1 +
 bigtop-tests/test-execution/integration/sqoop/pom.xml | 2 +-
 bigtop-tests/test-execution/longevity/io/pom.xml      | 1 +
 bigtop-tests/test-execution/longevity/pom.xml         | 1 +
 bigtop-tests/test-execution/package/pom.xml           | 2 +-
 bigtop-tests/test-execution/pom.xml                   | 1 +
 bigtop-tests/test-execution/smokes/crunch/pom.xml     | 2 +-
 bigtop-tests/test-execution/smokes/giraph/pom.xml     | 2 +-
 bigtop-tests/test-execution/smokes/hadoop/pom.xml     | 2 +-
 bigtop-tests/test-execution/smokes/hbase/pom.xml      | 2 +-
 bigtop-tests/test-execution/smokes/hcatalog/pom.xml   | 2 +-
 bigtop-tests/test-execution/smokes/httpfs/pom.xml     | 2 +-
 bigtop-tests/test-execution/smokes/hue/pom.xml        | 1 +
 bigtop-tests/test-execution/smokes/mahout/pom.xml     | 2 +-
 bigtop-tests/test-execution/smokes/oozie/pom.xml      | 2 +-
 bigtop-tests/test-execution/smokes/pom.xml            | 1 +
 bigtop-tests/test-execution/smokes/solr/pom.xml       | 2 +-
 bigtop-tests/test-execution/smokes/spark/pom.xml      | 2 +-
 bigtop-tests/test-execution/smokes/sqoop/pom.xml      | 2 +-
 pom.xml                                               | 1 +
 23 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/bigtop-test-framework/pom.xml b/bigtop-test-framework/pom.xml
index 1d81479..cdd456a 100644
--- a/bigtop-test-framework/pom.xml
+++ b/bigtop-test-framework/pom.xml
@@ -79,7 +79,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.20</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <includes>
             <include>**/*IntegrationTest*</include>
diff --git a/bigtop-tests/test-artifacts/pom.xml b/bigtop-tests/test-artifacts/pom.xml
index b0af51e..76e67b2 100644
--- a/bigtop-tests/test-artifacts/pom.xml
+++ b/bigtop-tests/test-artifacts/pom.xml
@@ -122,7 +122,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.7.1</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <includes>
             <include>**/Test*</include>
diff --git a/bigtop-tests/test-execution/common/pom.xml b/bigtop-tests/test-execution/common/pom.xml
index c34efb0..758448e 100644
--- a/bigtop-tests/test-execution/common/pom.xml
+++ b/bigtop-tests/test-execution/common/pom.xml
@@ -243,7 +243,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.11</version>
+          <version>${maven-failsafe-plugin.version}</version>
           <configuration>
             <includes>
               <include>${org.apache.maven-failsafe-plugin.testInclude}</include>
diff --git a/bigtop-tests/test-execution/integration/pom.xml b/bigtop-tests/test-execution/integration/pom.xml
index 111d925..97881c7 100644
--- a/bigtop-tests/test-execution/integration/pom.xml
+++ b/bigtop-tests/test-execution/integration/pom.xml
@@ -96,6 +96,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
+        <version>${maven-failsafe-plugin.version}</version>
       </plugin>
 
       <!--Let's skip unit tests all together for there are none-->
diff --git a/bigtop-tests/test-execution/integration/sqoop/pom.xml b/bigtop-tests/test-execution/integration/sqoop/pom.xml
index 80292f8..1920f63 100644
--- a/bigtop-tests/test-execution/integration/sqoop/pom.xml
+++ b/bigtop-tests/test-execution/integration/sqoop/pom.xml
@@ -97,7 +97,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
             <MYSQL_ROOTPW></MYSQL_ROOTPW>
diff --git a/bigtop-tests/test-execution/longevity/io/pom.xml b/bigtop-tests/test-execution/longevity/io/pom.xml
index 4e419bb..7e87095 100644
--- a/bigtop-tests/test-execution/longevity/io/pom.xml
+++ b/bigtop-tests/test-execution/longevity/io/pom.xml
@@ -67,6 +67,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
+        <version>${maven-failsafe-plugin.version}</version>
       </plugin>
     </plugins>
   </build>
diff --git a/bigtop-tests/test-execution/longevity/pom.xml b/bigtop-tests/test-execution/longevity/pom.xml
index 645171d..e9b363e 100644
--- a/bigtop-tests/test-execution/longevity/pom.xml
+++ b/bigtop-tests/test-execution/longevity/pom.xml
@@ -90,6 +90,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
+        <version>${maven-failsafe-plugin.version}</version>
       </plugin>
 
       <!--Let's skip unit tests all together for there are none-->
diff --git a/bigtop-tests/test-execution/package/pom.xml b/bigtop-tests/test-execution/package/pom.xml
index 8ba566c..3a5affb 100644
--- a/bigtop-tests/test-execution/package/pom.xml
+++ b/bigtop-tests/test-execution/package/pom.xml
@@ -42,7 +42,6 @@
     <org.apache.maven-dependency-plugin.output>${project.build.directory}</org.apache.maven-dependency-plugin.output>
 
     <org.apache.maven-dependency-plugin.type>jar</org.apache.maven-dependency-plugin.type>
-    <org.apache.maven-failsafe-plugin.testInclude>**/PackagesSuite*</org.apache.maven-failsafe-plugin.testInclude>
   </properties>
 
   <dependencies>
@@ -58,6 +57,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
              <bigtop.repo.host>${bigtop.repo.host}</bigtop.repo.host>
diff --git a/bigtop-tests/test-execution/pom.xml b/bigtop-tests/test-execution/pom.xml
index ce3a57a..db86190 100644
--- a/bigtop-tests/test-execution/pom.xml
+++ b/bigtop-tests/test-execution/pom.xml
@@ -18,6 +18,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
+  <failsafeVersion>2.12</failsafeVersion>
   <parent>
     <groupId>org.apache.bigtop</groupId>
     <artifactId>bigtop</artifactId>
diff --git a/bigtop-tests/test-execution/smokes/crunch/pom.xml b/bigtop-tests/test-execution/smokes/crunch/pom.xml
index 3ded514..0af1563 100644
--- a/bigtop-tests/test-execution/smokes/crunch/pom.xml
+++ b/bigtop-tests/test-execution/smokes/crunch/pom.xml
@@ -84,7 +84,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <additionalClasspathElements>
               <additionalClasspathElement>${HADOOP_CONF_DIR}</additionalClasspathElement>
diff --git a/bigtop-tests/test-execution/smokes/giraph/pom.xml b/bigtop-tests/test-execution/smokes/giraph/pom.xml
index af60586..32ed44b 100644
--- a/bigtop-tests/test-execution/smokes/giraph/pom.xml
+++ b/bigtop-tests/test-execution/smokes/giraph/pom.xml
@@ -89,7 +89,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <additionalClasspathElements>
               <additionalClasspathElement>${HADOOP_CONF_DIR}</additionalClasspathElement>
diff --git a/bigtop-tests/test-execution/smokes/hadoop/pom.xml b/bigtop-tests/test-execution/smokes/hadoop/pom.xml
index 053c3a2..a794528 100644
--- a/bigtop-tests/test-execution/smokes/hadoop/pom.xml
+++ b/bigtop-tests/test-execution/smokes/hadoop/pom.xml
@@ -107,7 +107,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <forkMode>always</forkMode>
           <systemPropertyVariables>
diff --git a/bigtop-tests/test-execution/smokes/hbase/pom.xml b/bigtop-tests/test-execution/smokes/hbase/pom.xml
index 6f87a79..10c092d 100644
--- a/bigtop-tests/test-execution/smokes/hbase/pom.xml
+++ b/bigtop-tests/test-execution/smokes/hbase/pom.xml
@@ -136,7 +136,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
             <org.apache.bigtop.itest.hbasesmoke.TestHbasePigSmoke.extra_jars>
diff --git a/bigtop-tests/test-execution/smokes/hcatalog/pom.xml b/bigtop-tests/test-execution/smokes/hcatalog/pom.xml
index f44227c..51273be 100644
--- a/bigtop-tests/test-execution/smokes/hcatalog/pom.xml
+++ b/bigtop-tests/test-execution/smokes/hcatalog/pom.xml
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <forkMode>always</forkMode>
         </configuration>
diff --git a/bigtop-tests/test-execution/smokes/httpfs/pom.xml b/bigtop-tests/test-execution/smokes/httpfs/pom.xml
index 963c482..1afd2fe 100644
--- a/bigtop-tests/test-execution/smokes/httpfs/pom.xml
+++ b/bigtop-tests/test-execution/smokes/httpfs/pom.xml
@@ -84,7 +84,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <additionalClasspathElements>
               <additionalClasspathElement>${HADOOP_CONF_DIR}</additionalClasspathElement>
diff --git a/bigtop-tests/test-execution/smokes/hue/pom.xml b/bigtop-tests/test-execution/smokes/hue/pom.xml
index 50edf4c..83b6392 100644
--- a/bigtop-tests/test-execution/smokes/hue/pom.xml
+++ b/bigtop-tests/test-execution/smokes/hue/pom.xml
@@ -57,6 +57,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
             <org.apache.bigtop.itest.hue_url>${HUE_URL}</org.apache.bigtop.itest.hue_url>
diff --git a/bigtop-tests/test-execution/smokes/mahout/pom.xml b/bigtop-tests/test-execution/smokes/mahout/pom.xml
index c7adff2..85ad363 100644
--- a/bigtop-tests/test-execution/smokes/mahout/pom.xml
+++ b/bigtop-tests/test-execution/smokes/mahout/pom.xml
@@ -84,7 +84,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <additionalClasspathElements>
               <additionalClasspathElement>${HADOOP_CONF_DIR}</additionalClasspathElement>
diff --git a/bigtop-tests/test-execution/smokes/oozie/pom.xml b/bigtop-tests/test-execution/smokes/oozie/pom.xml
index e945b43..812d22d 100644
--- a/bigtop-tests/test-execution/smokes/oozie/pom.xml
+++ b/bigtop-tests/test-execution/smokes/oozie/pom.xml
@@ -58,7 +58,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
             <org.apache.bigtop.itest.oozie_url>${OOZIE_URL}</org.apache.bigtop.itest.oozie_url>
diff --git a/bigtop-tests/test-execution/smokes/pom.xml b/bigtop-tests/test-execution/smokes/pom.xml
index e826df2..e89154a 100644
--- a/bigtop-tests/test-execution/smokes/pom.xml
+++ b/bigtop-tests/test-execution/smokes/pom.xml
@@ -193,6 +193,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
+        <version>${maven-failsafe-plugin.version}</version>
       </plugin>
 
       <!--Let's skip unit tests all together for there are none-->
diff --git a/bigtop-tests/test-execution/smokes/solr/pom.xml b/bigtop-tests/test-execution/smokes/solr/pom.xml
index 4f4c1b5..27e6440 100644
--- a/bigtop-tests/test-execution/smokes/solr/pom.xml
+++ b/bigtop-tests/test-execution/smokes/solr/pom.xml
@@ -58,7 +58,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
             <org.apache.bigtop.itest.solr_url>${SOLR_URL}</org.apache.bigtop.itest.solr_url>
diff --git a/bigtop-tests/test-execution/smokes/spark/pom.xml b/bigtop-tests/test-execution/smokes/spark/pom.xml
index 65050ed..7c7dea2 100644
--- a/bigtop-tests/test-execution/smokes/spark/pom.xml
+++ b/bigtop-tests/test-execution/smokes/spark/pom.xml
@@ -119,7 +119,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <forkMode>always</forkMode>
           <systemPropertyVariables>
diff --git a/bigtop-tests/test-execution/smokes/sqoop/pom.xml b/bigtop-tests/test-execution/smokes/sqoop/pom.xml
index a5fc295..f7f912a 100644
--- a/bigtop-tests/test-execution/smokes/sqoop/pom.xml
+++ b/bigtop-tests/test-execution/smokes/sqoop/pom.xml
@@ -89,7 +89,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.11</version>
+        <version>${maven-failsafe-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
             <sqoop.server.url>${SQOOP_URL}</sqoop.server.url>
diff --git a/pom.xml b/pom.xml
index b313e35..9e5621e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,7 @@
 
     <groovy.version>2.4.10</groovy.version>
     <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
+    <maven-failsafe-plugin.version>2.12</maven-failsafe-plugin.version>
     <groovy-eclipse-compiler.version>2.9.2-01</groovy-eclipse-compiler.version>
     <groovy-eclipse-batch.version>2.4.3-01</groovy-eclipse-batch.version>
     <gmaven.version>1.0</gmaven.version>