Author: tchemit Date: 2010-01-07 00:55:31 +0100 (Thu, 07 Jan 2010) New Revision: 69 Added: trunk/jredmine-client/src/site/site_fr.xml trunk/maven-jredmine-plugin/src/site/site_fr.xml trunk/src/site/site_fr.xml Removed: trunk/jredmine-client/src/site/site.xml trunk/maven-jredmine-plugin/src/site/site.xml trunk/src/site/site.xml Modified: trunk/jredmine-client/pom.xml trunk/maven-jredmine-plugin/pom.xml trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java trunk/maven-jredmine-plugin/src/site/apt/index.apt trunk/maven-jredmine-plugin/src/site/apt/usage.apt trunk/pom.xml Log: Evolution #187: Utilisation de mavenpom Evolution #82: faire la documentation Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2010-01-04 16:11:59 UTC (rev 68) +++ trunk/jredmine-client/pom.xml 2010-01-06 23:55:31 UTC (rev 69) @@ -51,10 +51,8 @@ <packaging>jar</packaging> <properties> - <redmine.releaseFiles> - target/${project.artifactId}-${project.version}-deps.zip, - target/${project.artifactId}-${project.version}-full.zip - </redmine.releaseFiles> + <!-- extra files to include in release --> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> </properties> <build> @@ -64,7 +62,6 @@ <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> - <version>1.2.0</version> <executions> <execution> <goals> @@ -96,6 +93,13 @@ <artifactId>plexus-maven-plugin</artifactId> <version>1.3.8</version> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.3</version> + </plugin> + </plugins> </reporting> <!-- ************************************************************* --> @@ -118,32 +122,6 @@ <build> <plugins> - <!-- always compute test source jar --> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- always compute test javadoc jar --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- launch in a release the assembly, but not attach it to project --> <plugin> @@ -173,6 +151,7 @@ </build> </profile> + </profiles> </project> Deleted: trunk/jredmine-client/src/site/site.xml =================================================================== --- trunk/jredmine-client/src/site/site.xml 2010-01-04 16:11:59 UTC (rev 68) +++ trunk/jredmine-client/src/site/site.xml 2010-01-06 23:55:31 UTC (rev 69) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur"> - <item name="Introduction" href="index.html"/> - <item name="JRedmine rails API" href="rails_api.html"/> - <item name="JRedmine java service" href="redmine_service.html"/> - </menu> - - <menu name="Développeur"> - <item name="Todo" href="todo.html"/> - </menu> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-tests.jar" - name="Test Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-test-javadoc.jar" - name="Test Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-test-sources.jar" - name="Test Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/jredmine-client/src/site/site_fr.xml (from rev 67, trunk/jredmine-client/src/site/site.xml) =================================================================== --- trunk/jredmine-client/src/site/site_fr.xml (rev 0) +++ trunk/jredmine-client/src/site/site_fr.xml 2010-01-06 23:55:31 UTC (rev 69) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="Introduction" href="index.html"/> + <item name="JRedmine rails API" href="rails_api.html"/> + <item name="JRedmine java service" href="redmine_service.html"/> + </menu> + + <menu name="Développeur"> + <item name="Todo" href="todo.html"/> + </menu> + + <menu name="Téléchargement"> + <item href="http://nuiton.org/projects/list_files/jredmine" name="Sources bundles"/> + + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-tests.jar" + name="Test Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-test-javadoc.jar" + name="Test Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-test-sources.jar" + name="Test Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2010-01-04 16:11:59 UTC (rev 68) +++ trunk/maven-jredmine-plugin/pom.xml 2010-01-06 23:55:31 UTC (rev 69) @@ -101,8 +101,7 @@ <!-- ************************************************************* --> <name>JRedmine :: Maven plugin</name> - <description>JRedmine maven plugin to interacts with Redmine's server - </description> + <description>JRedmine maven plugin to interacts with Redmine's server</description> <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> @@ -143,31 +142,6 @@ <version>2.5.1</version> </plugin> - <!--plugin> - <groupId>${project.groupId}</groupId> - <artifactId>maven-jredmine-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <xmlPath>${maven.changeFile}</xmlPath> - <issueLinkTemplate>${redmine.url}/issues/show/%ISSUE%</issueLinkTemplate> - <versionLinkTemplate>${redmine.url}/versions/show/%VERSION%</versionLinkTemplate> - <onlyCurrentVersion>true</onlyCurrentVersion> - <columnNames>key,summary,status,assignee,reporter,tracker,priority,version,category,createdOn</columnNames> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>issues-report</report> - <report>issues-report-by-tracker</report> - <report>issues-report-by-status</report> - <report>issues-report-by-category</report> - <report>issues-report-by-priority</report> - <report>issues-report-by-version</report> - </reports> - </reportSet> - </reportSets> - </plugin--> - </plugins> </reporting> @@ -210,7 +184,6 @@ <goal>install</goal> <goal>run</goal> </goals> - <!--<phase>validate</phase>--> </execution> </executions> </plugin> Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2010-01-04 16:11:59 UTC (rev 68) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2010-01-06 23:55:31 UTC (rev 69) @@ -152,7 +152,7 @@ report.setUrl(url.toString()); report.setIssues(issues); - report.setUsers(service.getUsers(id)); + report.setUsers(service.getProjectMembers(id)); report.setIssueCategories(service.getIssueCategories(id)); report.setIssueStatuses(service.getIssueStatuses()); report.setIssuePriorities(service.getIssuePriorities()); Modified: trunk/maven-jredmine-plugin/src/site/apt/index.apt =================================================================== --- trunk/maven-jredmine-plugin/src/site/apt/index.apt 2010-01-04 16:11:59 UTC (rev 68) +++ trunk/maven-jredmine-plugin/src/site/apt/index.apt 2010-01-06 23:55:31 UTC (rev 69) @@ -7,26 +7,62 @@ maven-redmine-plugin - //TODO-FILL_ME - - * Presentation - //TODO-FILL_ME + Le plugin <<maven-jredmine-plugin>> permet d'exécuter des opérations ou de + récuperer des données depuis un serveur redmine qui a installé le plugin + rails <<jredmine>>. * Goals Overview The plugin has the following goals: - //TODO-FILL_ME + * {{{display-data-mojo.html}display-data}} display some datas from a redmine server. + * {{{generate-changes-mojo.html}generate-changes}} generates the changes.xml files from issues of the project from a redmine server. + + * {{{publish-attachments-mojo.html}publish-attachments}} publish some files as attachment for the version of the project on a redmine server. + + * {{{publish-news-mojo.html}publish-news}} publish a news for the project on a redmine server. + + * {{{generate-email-announcement-mojo.html}generate-email-announcement}} generates the body of the email to send for a release using issues for the redmine server. + + * {{{generate-news-announcement-mojo.html}generate-news-announcement}} generates the body of the announcement's news to publish for a release using issues for the redmine server. + + * {{{update-version-mojo.html}update-version}} update the version of the project (close version) on a redmine server. + + * {{{next-version-mojo.html}next-version}} creates (if not exists) the version fo the project on a redmine server. + * {{{help-mojo.html}help}} display help about the plugin (goals, usage). +* Reports Overview + + The plugin has the following reports: + + + * {{{issues-report-mojo.html}issues-report}} generates a report for issues from Redmine's server. + + * {{{issues-report-by-tracker-mojo.html}issues-report-by-tracker}} generates a report for issues group by tracker's types from Redmine's server. + + * {{{issues-report-by-assignee-mojo.html}issues-report-by-assignee}} generates a report for issues group by assignee from Redmine's server. + + * {{{issues-report-by-category-mojo.html}issues-report-by-category}} generates a report for issues group by category from Redmine's server. + + * {{{issues-report-by-priority-mojo.html}issues-report-by-priority}} generates a report for issues group by priority from Redmine's server. + + * {{{issues-report-by-reporter-mojo.html}issues-report-by-reporter}} generates a report for issues group by reporter from Redmine's server. + + * {{{issues-report-by-status-mojo.html}issues-report-by-status}} generates a report for issues group by status from Redmine's server. + + * {{{issues-report-by-version-mojo.html}issues-report-by-version}} generates a report for issues group by version from Redmine's server. + * Usage Instructions on how to use the Plugin can be found on {{{usage.html}usage}} page * Examples - to be done. + Best example is a concrete project. + + Look at what does {{{http://maven.nuiton.org/release/org/nuiton/mavenpom.pom}mavenpom}}. Modified: trunk/maven-jredmine-plugin/src/site/apt/usage.apt =================================================================== --- trunk/maven-jredmine-plugin/src/site/apt/usage.apt 2010-01-04 16:11:59 UTC (rev 68) +++ trunk/maven-jredmine-plugin/src/site/apt/usage.apt 2010-01-06 23:55:31 UTC (rev 69) @@ -9,14 +9,210 @@ ------------------------------------------------------------------------------ +<plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>maven-jredmine-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate-changes</goal> + </goals> + <phase>process-classes</phase> + </execution> + </executions> + <configuration> + <generateOnce>true</generateOnce> + <actionMapping>fix:1, add:2</actionMapping> + <statusIds>3,4,5</statusIds> + </configuration> +</plugin> +------------------------------------------------------------------------------ + +* How does it work ? + //TODO-FILL_ME + +generate-email-announcement goal + ------------------------------------------------------------------------------ +<plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>maven-jredmine-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate-email-announcement</goal> + </goals> + <phase>process-classes</phase> + </execution> + </executions> + <configuration> + <urlDownload> + ${redmine.url}/projects/list_files/${projectId} + </urlDownload> + </configuration> +</plugin> +------------------------------------------------------------------------------ + * How does it work ? //TODO-FILL_ME +generate-news-announcement goal +------------------------------------------------------------------------------ + +<plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>maven-jredmine-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate-news-announcement</goal> + </goals> + <phase>process-classes</phase> + </execution> + </executions> + <configuration> + <urlDownload> + ${redmine.url}/projects/list_files/${projectId} + </urlDownload> + </configuration> +</plugin> +------------------------------------------------------------------------------ + +* How does it work ? + + //TODO-FILL_ME + +update-version goal + +------------------------------------------------------------------------------ + +<plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>maven-jredmine-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>update-version</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + <configuration> + <closeVersion>true</closeVersion> + </configuration> +</plugin> +------------------------------------------------------------------------------ + + or + +------------------------------------------------------------------------------ + +mvn jredmine:update-version -DcloseVersion +------------------------------------------------------------------------------ + +* How does it work ? + + //TODO-FILL_ME + +next-version goal + +------------------------------------------------------------------------------ + +<plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>maven-jredmine-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>next-version</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + <configuration> + <previousVersionName>1.0</previousVersionName> + </configuration> +</plugin> +------------------------------------------------------------------------------ + + or + +------------------------------------------------------------------------------ + +mvn jredmine:next-version -DpreviousVersionName=1.0 +------------------------------------------------------------------------------ + +* How does it work ? + + //TODO-FILL_ME + +publish-attachments goal + +------------------------------------------------------------------------------ + +<plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>maven-jredmine-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>publish-attachments</goal> + <goal>publish-news</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + <configuration> + <!-- for a multi-module just run on root project --> + <runOnce>true</runOnce> + + <!-- publish-attachments --> + <filesFromProperties>${redmine.collectedFiles}</filesFromProperties> + </configuration> +</plugin> +------------------------------------------------------------------------------ + +* How does it work ? + + //TODO-FILL_ME + +publish-news goal + +------------------------------------------------------------------------------ + +<plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>maven-jredmine-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>publish-news</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + <configuration> + <!-- for a multi-module just run on root project --> + <runOnce>true</runOnce> + + <!-- publish-news --> + <newsContentFile> + target/generated-sources/announcement/release-news-announcement.vm + </newsContentFile> + <newsSummary>${project.description}</newsSummary> + <newsTitle>${project.name} ${project.version} released</newsTitle> + </configuration> +</plugin> +------------------------------------------------------------------------------ + +* How does it work ? + + //TODO-FILL_ME + help goal This goal display the help of the plugin (available goals). @@ -25,13 +221,39 @@ ------------------------------------------------------------------------------ - mvn license:help + mvn jredmine:help ------------------------------------------------------------------------------ To display verbose help : ------------------------------------------------------------------------------ - mvn license:help -Ddetail + mvn jredmine:help -Ddetail ------------------------------------------------------------------------------ for full detail see {{{help-mojo.html}help}} detail page. + +issues-report report + +------------------------------------------------------------------------------ + +<plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>maven-jredmine-plugin</artifactId> + <configuration> + <columnNames> + key,summary,status,assignee,tracker,priority,version,category,createdOn + </columnNames> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>issues-report</report> + </reports> + </reportSet> + </reportSets> +</plugin> +------------------------------------------------------------------------------ + +* How does it work ? + + //TODO-FILL_ME Deleted: trunk/maven-jredmine-plugin/src/site/site.xml =================================================================== --- trunk/maven-jredmine-plugin/src/site/site.xml 2010-01-04 16:11:59 UTC (rev 68) +++ trunk/maven-jredmine-plugin/src/site/site.xml 2010-01-06 23:55:31 UTC (rev 69) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur"> - <item name="Introduction" href="index.html"/> - <item name="Usage" href="usage.html"/> - <item name="Goals" href="plugin-info.html"> - <item name="generate-changes" href="generate-changes-mojo.html"/> - <item name="display-data" href="display-data-mojo.html"/> - <item name="generate-email-announcement" href="generate-email-announcement-mojo.html"/> - <item name="generate-news-announcement" href="generate-news-announcement-mojo.html"/> - <item name="update-version" href="update-version-mojo.html"/> - <item name="next-version" href="next-version-mojo.html"/> - <item name="publish-news" href="publish-news-mojo.html"/> - <item name="publish-attachments" href="publish-attachments-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - <item name="Reports" href="plugin-info.html"> - <item name="issues-report" href="issues-report-mojo.html"/> - <item name="issues-report-by-assignee" href="issues-report-by-assignee-mojo.html"/> - <item name="issues-report-by-category" href="issues-report-by-category-mojo.html"/> - <item name="issues-report-by-priority" href="issues-report-by-priority-mojo.html"/> - <item name="issues-report-by-reporter" href="issues-report-by-reporter-mojo.html"/> - <item name="issues-report-by-status" href="issues-report-by-status-mojo.html"/> - <item name="issues-report-by-tracker" href="issues-report-by-tracker-mojo.html"/> - <item name="issues-report-by-version" href="issues-report-by-version-mojo.html"/> - </item> - </menu> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/maven-jredmine-plugin/src/site/site_fr.xml (from rev 67, trunk/maven-jredmine-plugin/src/site/site.xml) =================================================================== --- trunk/maven-jredmine-plugin/src/site/site_fr.xml (rev 0) +++ trunk/maven-jredmine-plugin/src/site/site_fr.xml 2010-01-06 23:55:31 UTC (rev 69) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="Introduction" href="index.html"/> + <item name="Usage" href="usage.html"/> + <item name="Goals" href="plugin-info.html"> + <item name="generate-changes" href="generate-changes-mojo.html"/> + <item name="display-data" href="display-data-mojo.html"/> + <item name="generate-email-announcement" href="generate-email-announcement-mojo.html"/> + <item name="generate-news-announcement" href="generate-news-announcement-mojo.html"/> + <item name="update-version" href="update-version-mojo.html"/> + <item name="next-version" href="next-version-mojo.html"/> + <item name="publish-news" href="publish-news-mojo.html"/> + <item name="publish-attachments" href="publish-attachments-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + <item name="Reports" href="plugin-info.html"> + <item name="issues-report" href="issues-report-mojo.html"/> + <item name="issues-report-by-assignee" href="issues-report-by-assignee-mojo.html"/> + <item name="issues-report-by-category" href="issues-report-by-category-mojo.html"/> + <item name="issues-report-by-priority" href="issues-report-by-priority-mojo.html"/> + <item name="issues-report-by-reporter" href="issues-report-by-reporter-mojo.html"/> + <item name="issues-report-by-status" href="issues-report-by-status-mojo.html"/> + <item name="issues-report-by-tracker" href="issues-report-by-tracker-mojo.html"/> + <item name="issues-report-by-version" href="issues-report-by-version-mojo.html"/> + </item> + </menu> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/maven-jredmine-plugin/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-04 16:11:59 UTC (rev 68) +++ trunk/pom.xml 2010-01-06 23:55:31 UTC (rev 69) @@ -9,7 +9,13 @@ <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> - <groupId>org.nuiton</groupId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.1.3</version> + </parent> + + <!--<groupId>org.nuiton</groupId>--> <artifactId>jredmine</artifactId> <version>1.0.3-SNAPSHOT</version> @@ -18,6 +24,13 @@ <module>maven-jredmine-plugin</module> </modules> + <!-- Source control management. --> + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> + </scm> + <dependencyManagement> <dependencies> @@ -366,14 +379,6 @@ <url>http://maven-site.nuiton.org/jredmine</url> - <licenses> - <license> - <name>Lesser General Public License (LGPL)</name> - <url>${maven.license.file}</url> - <distribution>local</distribution> - </license> - </licenses> - <developers> <developer> @@ -389,11 +394,6 @@ </developers> - <organization> - <name>CodeLutin</name> - <url>http://www.codelutin.com/</url> - </organization> - <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> @@ -402,76 +402,11 @@ <properties> - <platform>nuiton.org</platform> - <listId>jredmine</listId> + <projectId>jredmine</projectId> - <!-- java level is 1.6 --> - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> + <helper.version>1.2.0</helper.version> + <!--<jredmine.version>1.0.2</jredmine.version>--> - <!-- default encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8 - </project.reporting.outputEncoding> - - <!-- by default, use maven 2 source base dir --> - <maven.src.dir>${basedir}/src</maven.src.dir> - - <!-- where to generate sources --> - <maven.gen.dir>${project.build.directory}/generated-sources - </maven.gen.dir> - - <!-- where to generate test sources --> - <maven.test.gen.dir>${project.build.directory}/generated-test-sources - </maven.test.gen.dir> - - <!-- locales for the site generation, by default only french --> - <maven.site.locales>fr</maven.site.locales> - - <!-- le fichier de license du projet --> - <maven.license.file>${project.basedir}/LICENSE.txt</maven.license.file> - - <!-- to allow bad tests --> - <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> - - <!-- to skip tests (can use also profile notests) --> - <maven.test.skip>false</maven.test.skip> - - <!-- to control fork mode of tests --> - <maven.test.forkMode>once</maven.test.forkMode> - - <!-- to activate generation of reports and javadoc when doing a site --> - <maven.reports.generate>true</maven.reports.generate> - - <!-- to activate or not the generation of detail dependencies in site --> - <maven.reports.dependencyDetailsEnabled>true - </maven.reports.dependencyDetailsEnabled> - - <!-- to activate or not the generation of location detail of dependencies in site --> - <maven.reports.dependencyLocationsEnabled>true - </maven.reports.dependencyLocationsEnabled> - - <javadoc.version>2.5</javadoc.version> - - <!-- pour ne pas generer la javadoc --> - <maven.javadoc.skip>false</maven.javadoc.skip> - - <maven.version>2.2.1</maven.version> - <helper.version>1.2.0-SNAPSHOT</helper.version> - <license.version>2.0.0</license.version> - <jredmine.version>1.0.0</jredmine.version> - - <!-- default license to use --> - <license.licenseName>lgpl_v3</license.licenseName> - - <!-- release repository url (to be used in site.xml) --> - <repository.home.url>http://maven.nuiton.org/release - </repository.home.url> - - <!-- generated changes.xml file --> - <maven.changeFile>${maven.gen.dir}/changes/changes.xml - </maven.changeFile> - <!-- test config --> <test.redmineUrl>http://www.mynuiton.org</test.redmineUrl> <test.redmineUsername>chemit</test.redmineUsername> @@ -479,18 +414,6 @@ <test.verbose>false</test.verbose> <test.encoding>UTF-8</test.encoding> - <!-- redmine configuration --> - <redmine.safe>false</redmine.safe> - <redmine.url>http://www.${platform}</redmine.url> - <redmine.projectId>jredmine</redmine.projectId> - <redmine.xmlPath>${basedir}/target/generated-sources/changes/changes.xml - </redmine.xmlPath> - <redmine.issueLinkTemplate>${redmine.url}/issues/show/%ISSUE% - </redmine.issueLinkTemplate> - <redmine.versionLinkTemplate>${redmine.url}/versions/show/%VERSION% - </redmine.versionLinkTemplate> - <redmine.collectedFiles>target/collect.properties - </redmine.collectedFiles> </properties> <build> @@ -499,108 +422,25 @@ <plugins> - <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>check-project-files</id> - <goals> - <goal>enforce</goal> - </goals> - <phase>initialize</phase> - <configuration> - <rules> - <requireFilesExist> - <files> - <file>LICENSE.txt</file> - <file>README.txt</file> - <file>changelog.txt</file> - </files> - </requireFilesExist> - </rules> - <ignoreCache>true</ignoreCache> - <failFast>true</failFast> - <fail>true</fail> - - </configuration> - </execution> - </executions> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.3</version> - <configuration> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - - <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>2.4.3</version> <configuration> - <skip>${maven.test.skip}</skip> - <testFailureIgnore>${maven.test.testFailureIgnore} - </testFailureIgnore> - <forkMode>${maven.test.forkMode}</forkMode> <environmentVariables> - <test.redmineUrl>${test.redmineUrl} - </test.redmineUrl> - <test.redmineUsername>${test.redmineUsername} - </test.redmineUsername> - <test.redminePassword>${test.redminePassword} - </test.redminePassword> + <test.redmineUrl>${test.redmineUrl}</test.redmineUrl> + <test.redmineUsername>${test.redmineUsername}</test.redmineUsername> + <test.redminePassword>${test.redminePassword}</test.redminePassword> <test.verbose>${test.verbose}</test.verbose> </environmentVariables> </configuration> </plugin> <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>2.3</version> - <inherited>true</inherited> - - <configuration> - <archive> - <!-- cela fait bugger le chargement des service via - ServiceLoader donc on desactive --> - <!--index>true</index--> - <manifest> - <mainClass>${maven.jar.main.class}</mainClass> - </manifest> - <manifestEntries> - <url>${pom.url}</url> - </manifestEntries> - </archive> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - <version>2.1</version> - </plugin> - - <plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc.version}</version> <configuration> @@ -854,61 +694,14 @@ </plugin> <plugin> - <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - <configuration> - <inputEncoding>${project.reporting.outputEncoding} - </inputEncoding> - <outputEncoding>${project.reporting.outputEncoding} - </outputEncoding> - <generateReports>${maven.reports.generate} - </generateReports> - <locales>${maven.site.locales}</locales> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-9</version> - </plugin> - - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> - </plugin> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> - </plugin> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <version>${license.version}</version> - </plugin> - - <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - </plugin> - - <plugin> <artifactId>maven-invoker-plugin</artifactId> - <version>1.3</version> + <version>1.5</version> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-4</version> - <dependencies> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> - </dependency> - </dependencies> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + <version>1.2.0</version> </plugin> </plugins> @@ -919,42 +712,7 @@ <reporting> <plugins> - <!-- - The Project Info Reports Plugin has twelve goals: - see http://maven.apache.org/plugins/maven-project-info-reports-plugin - --> <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.1.2</version> - <configuration> - <dependencyDetailsEnabled> - ${maven.reports.dependencyDetailsEnabled} - </dependencyDetailsEnabled> - <dependencyLocationsEnabled> - ${maven.reports.dependencyLocationsEnabled} - </dependencyLocationsEnabled> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependencies</report> - <report>dependency-convergence</report> - <report>plugin-management</report> - <report>plugins</report> - <report>dependency-management</report> - <report>summary</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc.version}</version> <configuration> @@ -1215,211 +973,14 @@ </reportSets> </plugin> - <!-- changelog:changelog - changelog:dev-activity - changelog:file-activity --> - <!--FIXME : TC-20090816 : there is a bug with fileactivity - in report, trunk url are prefix with tag/xxx-releaseNumber !--> - <plugin> - <artifactId>maven-changelog-plugin</artifactId> - <version>2.1</version> - </plugin> - - <!-- Implicit add of reportSet to not generate jira reports --> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - <version>2.3</version> - <configuration> - <issueLinkTemplatePerSystem> - <redmine>${redmine.issueLinkTemplate}</redmine> - </issueLinkTemplatePerSystem> - <xmlPath>${redmine.xmlPath}</xmlPath> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>changes-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.3</version> - <configuration> - <encoding>${project.reporting.outputEncoding}</encoding> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.4</version> - <configuration> - <linkXRef>true</linkXRef> - <sourceEncoding>${project.reporting.outputEncoding} - </sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>${maven.compile.target}</targetJdk> - </configuration> - - </plugin> - - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.1</version> - </plugin> - - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.4.3</version> - </plugin> - </plugins> </reporting> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <!-- Build Environment : Environment Information --> - - <issueManagement> - <system>redmine</system> - <url>${redmine.url}/projects/jredmine/issues</url> - </issueManagement> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.nuiton.org/hudson/job/jredmine</url> - </ciManagement> - - <distributionManagement> - <repository> - <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/maven/release</url> - </repository> - <snapshotRepository> - <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/maven/snapshot</url> - </snapshotRepository> - <site> - <id>nuiton</id> - <url> - scpexe://nuiton.org/var/lib/redmine-nuiton/project-site/jredmine - </url> - </site> - </distributionManagement> - - <!--Any mailing lists for the project--> - <mailingLists> - <mailingList> - <name>jredmine-commits</name> - <subscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/jredmine-commits - </subscribe> - <unsubscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/jredmine-commits - </unsubscribe> - <post>jredmine-commits@list.nuiton.org</post> - <archive>http://list.nuiton.org/pipermail/jredmine-commits/ - </archive> - </mailingList> - - <mailingList> - <name>jredmine-devel</name> - <subscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/jredmine-devel - </subscribe> - <unsubscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/jredmine-devel - </unsubscribe> - <post>jredmine-devel@list.nuiton.org</post> - <archive>http://list.nuiton.org/pipermail/jredmine-devel/</archive> - </mailingList> - - <mailingList> - <name>jredmine-users</name> - <subscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/jredmine-users - </subscribe> - <unsubscribe> - http://list.nuiton.org/cgi-bin/mailman/listinfo/jredmine-users - </unsubscribe> - <post>jredmine-users@list.nuiton.org</post> - <archive>http://list.nuiton.org/pipermail/jredmine-users/</archive> - </mailingList> - </mailingLists> - - <!-- Source control management. --> - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk - </connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk - </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> - </scm> - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - - <!-- always compute source jar --> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- always compute javadoc jar --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- always add license and third-party files to classpath --> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>add-license</goal> - <goal>add-third-party</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - </build> - </profile> - + <!-- TC-20100106 Due to cyclic dependency problem between modules, + we do not propagate maven-jredmine-plugin to child modules --> <!-- perform only on a release stage when using the maven-release-plugin --> - <!--profile> + <profile> <id>redmine-pre-release-profile</id> <activation> <property> @@ -1437,9 +998,13 @@ <plugin> <groupId>org.nuiton.jredmine</groupId> <artifactId>maven-jredmine-plugin</artifactId> - <version>1.0.0-rc-2</version> + <version>${jredmine.version}</version> + <!-- TC-20100106 Due to cyclic dependency problem between modules, + we do not propagate maven-jredmine-plugin to child modules --> + <inherited>false</inherited> <configuration> - <columnNames>key,summary,status,assignee,tracker,priority,version,category,createdOn + <columnNames> + key,summary,status,assignee,tracker,priority,version,category,createdOn </columnNames> </configuration> <reportSets> @@ -1457,6 +1022,10 @@ <plugins> + <!-- + - obtain redmine login + - collect files for jredmine release + --> <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> @@ -1492,17 +1061,25 @@ </goals> <phase>install</phase> <configuration> - <extraFiles /> - <descriptionFile>${redmine.collectedFiles}</descriptionFile> + <extraFiles>${redmine.releaseFiles} + </extraFiles> + <descriptionFile>${redmine.collectedFiles} + </descriptionFile> + <includeAttached>${redmine.includeAttached} + </includeAttached> + <!--<copyFiles>false</copyFiles>--> </configuration> </execution> </executions> </plugin> + <!-- generate the changes.xml from redmine --> <plugin> <groupId>org.nuiton.jredmine</groupId> <artifactId>maven-jredmine-plugin</artifactId> - <version>1.0.0-rc-2</version> + <!-- TC-20100106 Due to cyclic dependency problem between modules, + we do not propagate maven-jredmine-plugin to child modules --> + <inherited>false</inherited> <executions> <execution> <id>jredmine-generate</id> @@ -1516,160 +1093,26 @@ </executions> <configuration> + <!-- generate-changes --> <generateOnce>true</generateOnce> <actionMapping>fix:1, add:2</actionMapping> <statusIds>3,4,5</statusIds> - <urlDownload>${redmine.url}/projects/list_files/maven-helper-plugin</urlDownload> + <!-- generate announcements --> + <urlDownload> + ${redmine.url}/projects/list_files/${projectId} + </urlDownload> + <!--<changesTitle>Release note of Maven pom project</changesTitle>--> + <!--<releaseDescription>Description of first release</releaseDescription>--> + <!--<verbose>true</verbose>--> </configuration> </plugin> </plugins> </build> - </profile--> - - <!-- perform a redmine release after a successfull release --> - <!--profile> - <id>redmine-release-profile</id> - <activation> - <property> - <name>performRedmineRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - <dryRun>true</dryRun> - <redmine.dryRun>${dryRun}</redmine.dryRun> - </properties> - <build> - - <plugins> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-redmine-login</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>initialize</phase> - <configuration> - <serverId>redmine-${platform}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - <execution> - <id>send-release-email</id> - <goals> - <goal>send-email</goal> - </goals> - <phase>validate</phase> - </execution> - </executions> - <configuration> - - <runOnce>true</runOnce> - - <emailTitle>[ANNOUNCEMENT] - ${project.name} ${project.version} released</emailTitle> - <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm - </emailContentFile> - <mailSender> - <name>${platform} Release Notification</name> - <email>noreply@${platform}</email> - </mailSender> - <toAddresses> - <item>${listId}-users@list.${platform}</item> - <item>${listId}-devel@list.${platform}</item> - <item>dev@codelutin.com</item> - </toAddresses> - <smtpHost>smtp</smtpHost> - </configuration> - </plugin> - - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> - <version>1.0.0-rc-2</version> - <executions> - <execution> - <id>jredmine-release</id> - <goals> - <goal>update-version</goal> - <goal>publish-attachments</goal> - <goal>publish-news</goal> - </goals> - <phase>validate</phase> - </execution> - </executions> - <configuration> - - <runOnce>true</runOnce> - - <closeVersion>true</closeVersion> - - <filesFromProperties>${redmine.collectedFiles}</filesFromProperties> - - <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm - </newsContentFile> - <newsSummary>${project.description}</newsSummary> - <newsTitle>${project.name} ${project.version} released</newsTitle> - </configuration> - </plugin> - - </plugins> - - </build> - </profile--> - - <!-- do not execute tests (generaly a bad idea...) --> - <profile> - <id>notests</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> </profile> - <!-- do not build reports (speedup site generation in dev) --> - <profile> - <id>noreports</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.reports.generate>false</maven.reports.generate> - </properties> - </profile> - <!-- do not build dependencies detail in maven-project-info-report (speedup site generation in dev) --> - <profile> - <id>nodepdetails</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.reports.dependencyDetailsEnabled>false - </maven.reports.dependencyDetailsEnabled> - </properties> - </profile> - <!-- do not build locations of dependencies in maven-project-info-report (speedup site generation in dev) --> - <profile> - <id>nodeplocations</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.reports.dependencyLocationsEnabled>false - </maven.reports.dependencyLocationsEnabled> - </properties> - </profile> - </profiles> </project> Deleted: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-01-04 16:11:59 UTC (rev 68) +++ trunk/src/site/site.xml 2010-01-06 23:55:31 UTC (rev 69) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> - - <body> - - <links> - <item name="Chorem" href="http://www.chorem.org"/> - <item name="Nuiton" href="http://www.nuiton.org"/> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="${project.organization.name}" href="${project.organization.url}"/> - <item name="dépôt maven" href="${repository.home.url}"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> - </breadcrumbs> - - <menu name="Utilisateur"> - <item name="Introduction" href="index.html"/> - </menu> - - <menu name="Développeur"> - <item name="Todo" href="todo.html"/> - </menu> - - <menu ref="modules"/> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/src/site/site_fr.xml (from rev 67, trunk/src/site/site.xml) =================================================================== --- trunk/src/site/site_fr.xml (rev 0) +++ trunk/src/site/site_fr.xml 2010-01-06 23:55:31 UTC (rev 69) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu name="Utilisateur"> + <item name="Introduction" href="index.html"/> + </menu> + + <menu name="Développeur"> + <item name="Todo" href="todo.html"/> + </menu> + + <menu ref="modules"/> + + <menu ref="reports"/> + + </body> +</project>