nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bbe...@apache.org
Subject [nifi-registry] branch master updated: NIFIREG-336 Enable Integration Tests by Default
Date Wed, 16 Oct 2019 18:31:53 GMT
This is an automated email from the ASF dual-hosted git repository.

bbende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
     new 28a50c3  NIFIREG-336 Enable Integration Tests by Default
28a50c3 is described below

commit 28a50c3994ea1d1da0d98a3bc4f5a486b2b1e90b
Author: Kevin Doran <kdoran@apache.org>
AuthorDate: Wed Oct 16 13:15:03 2019 -0400

    NIFIREG-336 Enable Integration Tests by Default
---
 .travis.yml |  2 +-
 README.md   |  4 ----
 pom.xml     | 24 ++++++++++++++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1cfe9be..e83abde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,5 +57,5 @@ install: true
 
 #build commands
 script:
-    - mvn clean install -Pintegration-tests,contrib-check,jsUnitTests | grep -v -F -f .travis-output-filters
&& exit ${PIPESTATUS[0]}
+    - mvn clean install -Pcontrib-check,jsUnitTests | grep -v -F -f .travis-output-filters
&& exit ${PIPESTATUS[0]}
 
diff --git a/README.md b/README.md
index b280201..98868bf 100644
--- a/README.md
+++ b/README.md
@@ -42,10 +42,6 @@ Registry—a subproject of Apache NiFi—is a complementary application
that pro
     If you wish to enable style and license checks, specify the contrib-check profile:
     
         mvn clean install -Pcontrib-check
-        
-    If you wish to run integration tests and contrib-check, specify both profiles:
-    
-        mvn clean install -Pcontrib-check,integration-tests
 
 3) Start the application
 
diff --git a/pom.xml b/pom.xml
index 71aab82..51c60c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -588,6 +588,19 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <phase>verify</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
                 <configuration>
@@ -664,13 +677,8 @@
             </build>
         </profile>
         <profile>
-            <!-- Performs execution of Integration Tests using the Maven
-                FailSafe Plugin. The view of integration tests in this context are those
-                tests loading a full web server with API war with no mocks. -->
-            <id>integration-tests</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <!-- Disables execution of integration tests managed by the Maven FailSafe
plugin. -->
+            <id>no-integration-tests</id>
             <build>
                 <plugins>
                     <plugin>
@@ -682,7 +690,7 @@
                                     <goal>integration-test</goal>
                                     <goal>verify</goal>
                                 </goals>
-                                <phase>verify</phase>
+                                <phase>none</phase>
                             </execution>
                         </executions>
                     </plugin>


Mime
View raw message