Author: tchemit Date: 2012-10-04 01:15:57 +0200 (Thu, 04 Oct 2012) New Revision: 337 Url: http://nuiton.org/repositories/revision/jredmine/337 Log: improve invoker configuration Modified: branches/jredmine-1.x/jredmine-client/pom.xml branches/jredmine-1.x/jredmine-client/src/it/settings.xml Modified: branches/jredmine-1.x/jredmine-client/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/pom.xml 2012-10-03 23:04:42 UTC (rev 336) +++ branches/jredmine-1.x/jredmine-client/pom.xml 2012-10-03 23:15:57 UTC (rev 337) @@ -229,52 +229,38 @@ <profile> <id>run-its</id> - <!--activation> + <activation> <property> - <name>maven.test.skip</name> - <value>!true</value> + <name>performRelease</name> + <value>true</value> </property> - </activation--> + </activation> <build> <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> <artifactId>maven-invoker-plugin</artifactId> <configuration> + <mergeUserSettings>true</mergeUserSettings> <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> <settingsFile>src/it/settings.xml</settingsFile> <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> </configuration> <executions> <execution> - <id>pre-integration-test</id> - <phase>pre-integration-test</phase> + <id>integration-test</id> <goals> <goal>install</goal> <goal>run</goal> </goals> <configuration> + <setupIncludes> + <setupInclude>redmine-test/pom.xml</setupInclude> + </setupIncludes> <pomIncludes> - <pomInclude>redmine-test/pom.xml</pomInclude> - </pomIncludes> - <pomExcludes> - <pomExclude>redmine-test-*/pom.xml</pomExclude> - </pomExcludes> - </configuration> - </execution> - <execution> - <id>integration-test</id> - <goals> - <goal>run</goal> - </goals> - <configuration> - <pomIncludes> <pomInclude>redmine-1.4.x/pom.xml</pomInclude> <pomInclude>redmine-2.0.x/pom.xml</pomInclude> </pomIncludes> - <pomExcludes> - <pomExclude>redmine-test/pom.xml</pomExclude> - </pomExcludes> </configuration> </execution> </executions> Modified: branches/jredmine-1.x/jredmine-client/src/it/settings.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/it/settings.xml 2012-10-03 23:04:42 UTC (rev 336) +++ branches/jredmine-1.x/jredmine-client/src/it/settings.xml 2012-10-03 23:15:57 UTC (rev 337) @@ -2,14 +2,6 @@ <settings> - <servers> - <!-- login to jredmine test its --> - <server> - <id>jredmine-test-it</id> - <username>admin</username> - <password>{UrtS0TkvEAMHUUe8h1DQCoL2/Mh5NeXFavzNjGAEW3I=}</password> - </server> - </servers> <profiles> <profile> <id>it-repo</id>