Author: tchemit Date: 2014-04-16 15:32:22 +0200 (Wed, 16 Apr 2014) New Revision: 1559 Url: http://forge.nuiton.org/projects/mavenpom/repository/revisions/1559 Log: fixes #3155 fixes #3160 Modified: trunk/mavenpom4redmine/pom.xml trunk/mavenpomdoc/src/site/apt/index.apt.vm trunk/mavenpomdoc/src/site/apt/mavenpom4redmine/properties.apt trunk/pom.xml Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2014-04-16 10:22:23 UTC (rev 1558) +++ trunk/mavenpom4redmine/pom.xml 2014-04-16 13:32:22 UTC (rev 1559) @@ -99,14 +99,11 @@ <!-- the redmine plateform used (nuiton.org or chorem.org) --> <platform>nuiton.org</platform> - <!-- change this to false for a private project (need some redmine login) --> - <publicProject>true</publicProject> - <license.licenseName>lgpl_v3</license.licenseName> <!-- redmine configuration --> <redmine.safe>false</redmine.safe> - <redmine.url>https://forge.${platform}</redmine.url> + <redmine.url>http://forge.${platform}</redmine.url> <redmine.projectId>${projectId}</redmine.projectId> <redmine.xmlPath> ${maven.root.dir}/target/changes/changes.xml @@ -187,7 +184,6 @@ <artifactId>jredmine-maven-plugin</artifactId> <version>${jredminePluginVersion}</version> <configuration> - <anonymous>${publicProject}</anonymous> <columnNames> key,summary,status,assignee,tracker,priority,version,category,createdOn </columnNames> @@ -267,8 +263,6 @@ </goals> <phase>process-classes</phase> <configuration> - <!-- As now (5.1) using the apiKey, we need to get user (tchemit-2012-05-16)--> - <anonymous>false</anonymous> <generateOnce>true</generateOnce> <actionMapping>fix:1, add:2, update:4</actionMapping> <statusIds>3,4,5</statusIds> @@ -410,7 +404,6 @@ <skipGenerateNewsAnnouncement> ${skipReleasePublishNews} </skipGenerateNewsAnnouncement> - <anonymous>${publicProject}</anonymous> <urlDownload> ${redmine.url}/projects/${projectId}/files </urlDownload> Modified: trunk/mavenpomdoc/src/site/apt/index.apt.vm =================================================================== --- trunk/mavenpomdoc/src/site/apt/index.apt.vm 2014-04-16 10:22:23 UTC (rev 1558) +++ trunk/mavenpomdoc/src/site/apt/index.apt.vm 2014-04-16 13:32:22 UTC (rev 1559) @@ -52,6 +52,16 @@ Nouveautés +* Nouveautés de la version 5.0.5 + +** Utilisation jredmine 1.8 + + Cela nous permet de simplifier la configuration jredmine + + * plus besoin de passer le username + + * plus besoin de gérer une propriété <<publicProject>> + * Nouveautés de la version 5.0.4 ** Correction de l'envoie de l'annonce par courriel Modified: trunk/mavenpomdoc/src/site/apt/mavenpom4redmine/properties.apt =================================================================== --- trunk/mavenpomdoc/src/site/apt/mavenpom4redmine/properties.apt 2014-04-16 10:22:23 UTC (rev 1558) +++ trunk/mavenpomdoc/src/site/apt/mavenpom4redmine/properties.apt 2014-04-16 13:32:22 UTC (rev 1559) @@ -43,8 +43,6 @@ *----------------------------------------------+--------------------------------------------------------+ | {{platform}} | <<nuiton.org>> | *----------------------------------------------+--------------------------------------------------------+ -| {{publicProject}} | <<true>> | -*----------------------------------------------+--------------------------------------------------------+ | {{redmine.url}} | <<http://forge.$\{platform\}>> | *----------------------------------------------+--------------------------------------------------------+ | {{redmine.serverId}} | <<redmine-forge.$\{platform\}>> | @@ -104,19 +102,12 @@ {{{Propriétés de base}[remonter]}} -* {publicProject} - - Pour savoir si un project est public. Si le projet est privé dans redmine, il - faut alors mettre comme valeur <<false>>. - - {{{Propriétés de base}[remonter]}} - * {redmine.url} L'url du serveur redmine. -------------------------------------------------------------------------------- -http://forge.${platform} +https://forge.${platform} -------------------------------------------------------------------------------- <Note:> en théorie, cette propriété ne doit pas être modifiée. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-16 10:22:23 UTC (rev 1558) +++ trunk/pom.xml 2014-04-16 13:32:22 UTC (rev 1559) @@ -235,7 +235,7 @@ <!-- our plugins --> <helperPluginVersion>2.1</helperPluginVersion> - <jredminePluginVersion>1.7</jredminePluginVersion> + <jredminePluginVersion>1.8</jredminePluginVersion> <jrstPluginVersion>2.0.1</jrstPluginVersion> <!-- apache maven plugins version --> @@ -1703,10 +1703,6 @@ <inherited>false</inherited> <configuration> <serverId>redmine-forge.nuiton.org</serverId> - <!--<usernameOut>redmine.username</usernameOut>--> - <!-- TC-20100124 just expose username, no need - password --> - <!--<passwordOut>redmine.password</passwordOut>--> <privateKeyOut>redmine.apiKey</privateKeyOut> </configuration> </execution> @@ -1743,13 +1739,9 @@ </execution> </executions> <configuration> - <generateOnce>true</generateOnce> <actionMapping>fix:1, add:2, update:4</actionMapping> <statusIds>3,4,5</statusIds> - <!-- As now (5.1) using the apiKey, we need to get user (tchemit-2012-05-16)--> - <anonymous>false</anonymous> - </configuration> </plugin> @@ -2032,7 +2024,6 @@ <skipGenerateNewsAnnouncement> ${skipInternalReleasePublishNews} </skipGenerateNewsAnnouncement> - <anonymous>${publicProject}</anonymous> <urlDownload> ${redmine.url}/projects/${projectId}/files </urlDownload>