Author: khmarbaise Date: Thu Jan 15 16:30:41 2015 New Revision: 1652165 URL: http://svn.apache.org/r1652165 Log: Cleaned up configuration Removed maven-surefire-plugin configuration cause the defaults are working. Replaced maven-surefire-plugin for integration tests with maven-failsafe-plugin.
Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1652165&r1=1652164&r2=1652165&view=diff ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Thu Jan 15 16:30:41 2015 @@ -148,28 +148,9 @@ under the License. </dependencies> <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - </testResources> - <pluginManagement> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.12</version> - <configuration> - <includes> - <include>**/*Test.java</include> - </includes> - <excludes> - <exclude>**/testutil/**</exclude> - </excludes> - </configuration> - </plugin> - <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> @@ -198,24 +179,24 @@ under the License. <directory>src/it</directory> <filtering>true</filtering> </testResource> + <testResource> + <directory>src/test/resources</directory> + </testResource> </testResources> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> + <artifactId>maven-failsafe-plugin</artifactId> <executions> <execution> <id>integration-tests</id> - <phase>integration-test</phase> <goals> - <goal>test</goal> + <goal>integration-test</goal> + <goal>verify</goal> </goals> <configuration> - <includes> - <include>**/*IT.java</include> - </includes> <systemPropertyVariables> <maven.repo.local>${project.build.directory}/it-repo</maven.repo.local> </systemPropertyVariables>