Author: tchemit Date: 2010-01-25 00:00:58 +0100 (Mon, 25 Jan 2010) New Revision: 809 Modified: trunk/mavenpom4labs/src/site/site_en.xml trunk/mavenpom4labs/src/site/site_fr.xml trunk/mavenpom4redmine/pom.xml trunk/mavenpom4redmine/src/site/site_en.xml trunk/mavenpom4redmine/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Log: Evolution #262: Utilisation de maven-jredmine-plugin 1.1.3 Evolution #271: Generate sitemap for site Modified: trunk/mavenpom4labs/src/site/site_en.xml =================================================================== --- trunk/mavenpom4labs/src/site/site_en.xml 2010-01-24 22:22:56 UTC (rev 808) +++ trunk/mavenpom4labs/src/site/site_en.xml 2010-01-24 23:00:58 UTC (rev 809) @@ -19,10 +19,6 @@ <item name="Mavenpom" href="../../en/index.html"/> </menu> - <menu name="Language"> - <item name="Version française" href="/../index.html"/> - </menu> - <menu name="Inside mavenpom4labs"> <item name="Home" href="/index.html"/> <item name="Properties" href="properties.html"/> @@ -34,6 +30,11 @@ <item name="Make a release" href="release.html"/> </menu> + <menu name="Divers"> + <item name="Version française" href="/../index.html"/> + <item name="Site map" href="./sitemap.html"/> + </menu> + <menu ref="reports"/> </body> Modified: trunk/mavenpom4labs/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4labs/src/site/site_fr.xml 2010-01-24 22:22:56 UTC (rev 808) +++ trunk/mavenpom4labs/src/site/site_fr.xml 2010-01-24 23:00:58 UTC (rev 809) @@ -15,10 +15,6 @@ <menu ref="parent"/> - <menu name="Langue"> - <item name="English version" href="/en/index.html"/> - </menu> - <menu name="Dissection de mavenpom4labs"> <item name="Accueil" href="index.html"/> <item name="Propriétés" href="properties.html"/> @@ -30,6 +26,11 @@ <item name="Faire une release" href="release.html"/> </menu> + <menu name="Divers"> + <item name="English version" href="/en/index.html"/> + <item name="Site map" href="./sitemap.html"/> + </menu> + <menu ref="reports"/> </body> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2010-01-24 22:22:56 UTC (rev 808) +++ trunk/mavenpom4redmine/pom.xml 2010-01-24 23:00:58 UTC (rev 809) @@ -198,7 +198,7 @@ <plugins> <!-- - - obtain redmine login (for both default and site lifecycle) + - obtain redmine username - collect all artifacts attached to build for announcements --> <plugin> @@ -213,22 +213,12 @@ <phase>initialize</phase> <configuration> <serverId>redmine-${platform}</serverId> - <passwordOut>redmine.password</passwordOut> <usernameOut>redmine.username</usernameOut> + <!-- TC-20100124 just expose username, no need + password --> + <!--<passwordOut>redmine.password</passwordOut>--> </configuration> </execution> - <!--execution> - <id>get-redmine-login-site</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>pre-site</phase> - <configuration> - <serverId>redmine-${platform}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution--> <execution> <id>collect-build-artifacts</id> <goals> Modified: trunk/mavenpom4redmine/src/site/site_en.xml =================================================================== --- trunk/mavenpom4redmine/src/site/site_en.xml 2010-01-24 22:22:56 UTC (rev 808) +++ trunk/mavenpom4redmine/src/site/site_en.xml 2010-01-24 23:00:58 UTC (rev 809) @@ -34,6 +34,11 @@ <item name="Make a release" href="release.html"/> </menu> + <menu name="Divers"> + <item name="Version française" href="/../index.html"/> + <item name="Site map" href="./sitemap.html"/> + </menu> + <menu ref="reports"/> </body> Modified: trunk/mavenpom4redmine/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4redmine/src/site/site_fr.xml 2010-01-24 22:22:56 UTC (rev 808) +++ trunk/mavenpom4redmine/src/site/site_fr.xml 2010-01-24 23:00:58 UTC (rev 809) @@ -15,10 +15,6 @@ <menu ref="parent"/> - <menu name="Langue"> - <item name="English version" href="/en/index.html"/> - </menu> - <menu name="Dissection de mavenpom4redmine"> <item name="Accueil" href="index.html"/> <item name="Propriétés" href="properties.html"/> @@ -30,6 +26,11 @@ <item name="Faire une release" href="release.html"/> </menu> + <menu name="Divers"> + <item name="English version" href="/en/index.html"/> + <item name="Site map" href="./sitemap.html"/> + </menu> + <menu ref="reports"/> </body> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-24 22:22:56 UTC (rev 808) +++ trunk/pom.xml 2010-01-24 23:00:58 UTC (rev 809) @@ -303,8 +303,8 @@ <plexus-component-javadoc.version>1.3.0</plexus-component-javadoc.version> <helper.version>1.2.2</helper.version> - <jredmine.version>1.1.3-SNAPSHOT</jredmine.version> - <license.version>2.0.1</license.version> + <jredmine.version>1.1.3</jredmine.version> + <license.version>2.0.2</license.version> <jrst.version>1.1.0</jrst.version> <skin.version>1.0.2</skin.version> @@ -900,12 +900,13 @@ <profile> <id>release-sign-artifacts</id> - <activation> + <!-- uncomment this when pgp key will be ok --> + <!--activation> <property> <name>performRelease</name> <value>true</value> </property> - </activation> + </activation--> <build> <plugins> <plugin> @@ -1089,6 +1090,53 @@ </build> </profile> + <profile> + <id>update-site-header</id> + <activation> + <property> + <name>updateSiteHeader</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>process-resources</defaultGoal> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <executions> + <execution> + <id>update-site-xml-header</id> + <goals> + <goal>update-header</goal> + </goals> + <phase>process-resources</phase> + <configuration> + <compileSourceRoots>${basedir}/src/site + </compileSourceRoots> + <generatorName>license-xml</generatorName> + <includes>**/*.xml</includes> + </configuration> + </execution> + <execution> + <id>update-site-apt-header</id> + <goals> + <goal>update-header</goal> + </goals> + <phase>process-resources</phase> + <configuration> + <compileSourceRoots>${basedir}/src/site + </compileSourceRoots> + <generatorName>license-apt</generatorName> + <includes>**/*.apt</includes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <!-- just add to build the webstart --> <profile> <id>webstart-profile</id> @@ -1280,23 +1328,13 @@ <inherited>false</inherited> <configuration> <serverId>redmine-nuiton.org</serverId> - <passwordOut>redmine.password</passwordOut> <usernameOut>redmine.username</usernameOut> + <!-- TC-20100124 just expose username, no need + password --> + <!--<passwordOut>redmine.password</passwordOut>--> </configuration> </execution> <execution> - <id>get-redmine-login-site</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>pre-site</phase> - <configuration> - <serverId>redmine-${platform}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - <execution> <id>collect-build-artifacts</id> <goals> <goal>collect-files</goal> @@ -1405,7 +1443,28 @@ <defaultGoal>generate-sources</defaultGoal> <plugins> + <!-- + - obtain redmine login + --> + <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>validate</phase> + <configuration> + <serverId>redmine-${platform}</serverId> + <passwordOut>redmine.password</passwordOut> + <usernameOut>redmine.username</usernameOut> + </configuration> + </execution> + </executions> + </plugin> <!-- - upload attachments - generate the changes.xml from redmine @@ -1461,10 +1520,9 @@ <build> - <defaultGoal>generate-sources</defaultGoal> + <defaultGoal>validate</defaultGoal> <plugins> - <!-- - obtain redmine login - send release email @@ -1474,6 +1532,18 @@ <artifactId>maven-helper-plugin</artifactId> <executions> <execution> + <id>get-redmine-login</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>validate</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> @@ -1520,7 +1590,7 @@ <goal>update-version</goal> <goal>publish-news</goal> </goals> - <phase>generate-sources</phase> + <phase>validate</phase> <inherited>false</inherited> </execution> </executions> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-01-24 22:22:56 UTC (rev 808) +++ trunk/src/site/site_en.xml 2010-01-24 23:00:58 UTC (rev 809) @@ -39,10 +39,6 @@ <item name="Mavenpom4labs" href="../mavenpom4labs/en/index.html"/> </menu> - <menu name="Language"> - <item name="Version française" href="/../index.html"/> - </menu> - <menu name="Inside mavenpom"> <item name="Home" href="/index.html"/> <item name="Properties" href="properties.html"/> @@ -61,6 +57,12 @@ <item name="maven-license-plugin" href="../../maven-license-plugin"/> </menu> + + <menu name="Divers"> + <item name="Version française" href="/../index.html"/> + <item name="Site map" href="./sitemap.html"/> + </menu> + <menu ref="reports"/> </body> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-01-24 22:22:56 UTC (rev 808) +++ trunk/src/site/site_fr.xml 2010-01-24 23:00:58 UTC (rev 809) @@ -34,10 +34,6 @@ <menu ref="modules"/> - <menu name="Langue"> - <item name="English version" href="/en/index.html"/> - </menu> - <menu name="Utiliser mavenpom"> <item name="Accueil" href="index.html"/> <item name="Propriétés" href="properties.html"/> @@ -54,9 +50,14 @@ <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/> <item name="maven-license-plugin" href="http://maven-site.nuiton.org/maven-license-plugin"/> - <item name="Site map" href="./sitempa.html"/> + </menu> + <menu name="Divers"> + <item name="English version" href="/en/index.html"/> + <item name="Site map" href="./sitemap.html"/> + </menu> + <menu ref="reports"/> </body>