Author: tchemit Date: 2009-10-10 12:00:15 +0200 (Sat, 10 Oct 2009) New Revision: 13 Modified: trunk/maven-jredmine-plugin/src/it/multi/pom.xml trunk/maven-jredmine-plugin/src/it/multi/verify.groovy trunk/maven-jredmine-plugin/src/it/single/pom.xml trunk/maven-jredmine-plugin/src/it/single/verify.groovy trunk/pom.xml Log: - fix integration tests - use javadoc 2.5 (2.6 has a lot of strange behaviours or is not well used...) Modified: trunk/maven-jredmine-plugin/src/it/multi/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/src/it/multi/pom.xml 2009-10-10 09:46:45 UTC (rev 12) +++ trunk/maven-jredmine-plugin/src/it/multi/pom.xml 2009-10-10 10:00:15 UTC (rev 13) @@ -32,7 +32,7 @@ <!-- default encoding --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.changeFile>target/changes/changes.xml</maven.changeFile> + <maven.changeFile>target/generated-sources/changes/changes.xml</maven.changeFile> <maven.redmine.issue.url>http://www.mynuiton.org/issues/show/%ISSUE%</maven.redmine.issue.url> <redmine.serverId>redmine-local</redmine.serverId> <redmine.projectId>one</redmine.projectId> @@ -54,6 +54,12 @@ <artifactId>maven-jredmine-plugin</artifactId> <version>${pluginVersion}</version> </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>1.0.3</version> + </plugin> </plugins> </pluginManagement> @@ -61,6 +67,27 @@ <plugins> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <!-- collect files to send to redmine --> + <execution> + <id>collect-files</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <extraFiles>${releaseFiles}</extraFiles> + <descriptionFile>${collectedFiles}</descriptionFile> + <!--<copyFiles>false</copyFiles>--> + </configuration> + </execution> + + </executions> + </plugin> + + <plugin> <groupId>org.nuiton.jredmine</groupId> <artifactId>maven-jredmine-plugin</artifactId> <executions> @@ -98,7 +125,7 @@ <configuration> <!-- Send nothing ! --> - <dryRun>true</dryRun> + <!--<dryRun>true</dryRun>--> <!-- update-version --> <closeVersion>true</closeVersion> @@ -107,7 +134,7 @@ <filesFromProperties>${collectedFiles}</filesFromProperties> <!-- publish-news --> - <newsContentFile>target/announcement/release-news-announcement.vm</newsContentFile> + <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm</newsContentFile> <newsSummary>${project.description}</newsSummary> <newsTitle>${project.name} ${project.version} released</newsTitle> Modified: trunk/maven-jredmine-plugin/src/it/multi/verify.groovy =================================================================== --- trunk/maven-jredmine-plugin/src/it/multi/verify.groovy 2009-10-10 09:46:45 UTC (rev 12) +++ trunk/maven-jredmine-plugin/src/it/multi/verify.groovy 2009-10-10 10:00:15 UTC (rev 13) @@ -17,17 +17,17 @@ * specific language governing permissions and limitations * under the License. */ -assert new File(basedir, 'target/changes/changes.xml').exists(); -assert new File(basedir, 'target/announcement/release-news-announcement.vm').exists(); -assert new File(basedir, 'target/announcement/release-email-announcement.vm').exists(); +assert new File(basedir, 'target/generated-sources/changes/changes.xml').exists(); +assert new File(basedir, 'target/generated-sources/announcement/release-news-announcement.vm').exists(); +assert new File(basedir, 'target/generated-sources/announcement/release-email-announcement.vm').exists(); assert new File(basedir, 'target/collect.properties').exists(); -assert !new File(basedir, 'module1/target/announcement/release-news-announcement.vm').exists(); -assert !new File(basedir, 'module1/target/announcement/release-email-announcement.vm').exists(); +assert !new File(basedir, 'module1/target/generated-sources/announcement/release-news-announcement.vm').exists(); +assert !new File(basedir, 'module1/target/generated-sources/announcement/release-email-announcement.vm').exists(); assert !new File(basedir, 'module1/target/collect.properties').exists(); -assert !new File(basedir, 'module2/target/announcement/release-news-announcement.vm').exists(); -assert !new File(basedir, 'module2/target/announcement/release-email-announcement.vm').exists(); +assert !new File(basedir, 'module2/target/generated-sources/announcement/release-news-announcement.vm').exists(); +assert !new File(basedir, 'module2/target/generated-sources/announcement/release-email-announcement.vm').exists(); assert !new File(basedir, 'module2/target/collect.properties').exists(); assert new File(basedir, 'target/collect/org.nuiton.jredmine.test.multi--pom/pom.xml').exists(); @@ -37,7 +37,7 @@ assert new File(basedir, 'target/collect/org.nuiton.jredmine.test.multi--module2/module2-0.jar').exists(); assert new File(basedir, 'target/collect/org.nuiton.jredmine.test.multi--module2/module2.txt').exists(); -//content = new File(basedir, 'target/announcement/announcement.vm').text; +//content = new File(basedir, 'target/generated-sources/announcement/announcement.vm').text; //assert content.contains( 'Test report.' ); Modified: trunk/maven-jredmine-plugin/src/it/single/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/src/it/single/pom.xml 2009-10-10 09:46:45 UTC (rev 12) +++ trunk/maven-jredmine-plugin/src/it/single/pom.xml 2009-10-10 10:00:15 UTC (rev 13) @@ -26,7 +26,7 @@ <!-- default encoding --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.changeFile>target/changes/changes.xml</maven.changeFile> + <maven.changeFile>target/generated-sources/changes/changes.xml</maven.changeFile> <maven.redmine.issue.url>http://www.mynuiton.org/issues/show/%ISSUE%</maven.redmine.issue.url> <redmine.serverId>redmine-local</redmine.serverId> <redmine.projectId>one</redmine.projectId> @@ -48,12 +48,39 @@ <artifactId>maven-jredmine-plugin</artifactId> <version>${pluginVersion}</version> </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>1.0.3</version> + </plugin> </plugins> </pluginManagement> <plugins> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <!-- collect files to send to redmine --> + <execution> + <id>collect-files</id> + <goals> + <goal>collect-files</goal> + </goals> + <phase>package</phase> + <configuration> + <extraFiles>${releaseFiles}</extraFiles> + <descriptionFile>${collectedFiles}</descriptionFile> + <!--<copyFiles>false</copyFiles>--> + </configuration> + </execution> + + </executions> + </plugin> + + <plugin> <groupId>org.nuiton.jredmine</groupId> <artifactId>maven-jredmine-plugin</artifactId> <executions> @@ -113,7 +140,7 @@ <filesFromProperties>${collectedFiles}</filesFromProperties> <!-- publish-news --> - <newsContentFile>target/announcement/release-news-announcement.vm</newsContentFile> + <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm</newsContentFile> <newsSummary>${project.description}</newsSummary> <newsTitle>${project.name} ${project.version} released</newsTitle> <!-- Modified: trunk/maven-jredmine-plugin/src/it/single/verify.groovy =================================================================== --- trunk/maven-jredmine-plugin/src/it/single/verify.groovy 2009-10-10 09:46:45 UTC (rev 12) +++ trunk/maven-jredmine-plugin/src/it/single/verify.groovy 2009-10-10 10:00:15 UTC (rev 13) @@ -17,14 +17,14 @@ * specific language governing permissions and limitations * under the License. */ - assert new File(basedir, 'target/changes/changes.xml').exists(); - assert new File(basedir, 'target/announcement/release-news-announcement.vm').exists(); - assert new File(basedir, 'target/announcement/release-email-announcement.vm').exists(); + assert new File(basedir, 'target/generated-sources/changes/changes.xml').exists(); + assert new File(basedir, 'target/generated-sources/announcement/release-news-announcement.vm').exists(); + assert new File(basedir, 'target/generated-sources/announcement/release-email-announcement.vm').exists(); assert new File(basedir, 'target/collect.properties').exists(); assert new File(basedir, 'target/collect/org.nuiton.jredmine.test--single/pom.xml').exists(); assert new File(basedir, 'target/collect/org.nuiton.jredmine.test--single/single-0.jar').exists(); -//content = new File(basedir, 'target/announcement/announcement.vm').text; +//content = new File(basedir, 'target/generated-sources/announcement/announcement.vm').text; //assert content.contains( 'Test report.' ); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 09:46:45 UTC (rev 12) +++ trunk/pom.xml 2009-10-10 10:00:15 UTC (rev 13) @@ -223,7 +223,7 @@ <!-- to activate or not the generation of location detail of dependencies in site --> <maven.reports.dependencyLocationsEnabled>true</maven.reports.dependencyLocationsEnabled> - <javadoc.version>2.6</javadoc.version> + <javadoc.version>2.5</javadoc.version> <!-- pour ne pas generer la javadoc --> <maven.javadoc.skip>false</maven.javadoc.skip>