This is an automated email from the ASF dual-hosted git repository. aboda pushed a commit to branch NIFIREG-371-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
commit 9849f85dda796db7d097a05a40c2691d5e4fcc37 Author: Kevin Doran <[email protected]> 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 e97bc60..cfa73af 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>
