Author: tchemit Date: 2010-10-22 18:37:34 +0200 (Fri, 22 Oct 2010) New Revision: 1018 Url: http://nuiton.org/repositories/revision/mavenpom/1018 Log: Anomalie #967: JDK package list location has changed Evolution #969: Updates maven-site-plugin to 3.0-beta-3 Evolution #970: Use camelCase style for version properties (as done by maven guys) Modified: trunk/mavenpom4labs/src/site/apt/minimalpom.apt trunk/mavenpom4labs/src/site/en/apt/minimalpom.apt trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/en/apt/minimalpom.apt trunk/mavenpom4redmine/pom.xml trunk/mavenpom4redmine/src/site/apt/minimalpom.apt trunk/mavenpom4redmine/src/site/en/apt/minimalpom.apt trunk/pom.xml trunk/src/site/apt/properties.apt trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/mavenpom4labs/src/site/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4labs/src/site/apt/minimalpom.apt 2010-10-22 08:56:59 UTC (rev 1017) +++ trunk/mavenpom4labs/src/site/apt/minimalpom.apt 2010-10-22 16:37:34 UTC (rev 1018) @@ -129,7 +129,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/mavenpom4labs/src/site/en/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4labs/src/site/en/apt/minimalpom.apt 2010-10-22 08:56:59 UTC (rev 1017) +++ trunk/mavenpom4labs/src/site/en/apt/minimalpom.apt 2010-10-22 16:37:34 UTC (rev 1018) @@ -130,7 +130,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt 2010-10-22 08:56:59 UTC (rev 1017) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt 2010-10-22 16:37:34 UTC (rev 1018) @@ -127,7 +127,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/en/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/en/apt/minimalpom.apt 2010-10-22 08:56:59 UTC (rev 1017) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/en/apt/minimalpom.apt 2010-10-22 16:37:34 UTC (rev 1018) @@ -128,7 +128,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2010-10-22 08:56:59 UTC (rev 1017) +++ trunk/mavenpom4redmine/pom.xml 2010-10-22 16:37:34 UTC (rev 1018) @@ -237,7 +237,7 @@ <plugin> <groupId>org.nuiton.jredmine</groupId> <artifactId>maven-jredmine-plugin</artifactId> - <version>${jredmine.version}</version> + <version>${jredminePluginVersion}</version> <configuration> <columnNames> key,summary,status,assignee,tracker,priority,version,category,createdOn Modified: trunk/mavenpom4redmine/src/site/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4redmine/src/site/apt/minimalpom.apt 2010-10-22 08:56:59 UTC (rev 1017) +++ trunk/mavenpom4redmine/src/site/apt/minimalpom.apt 2010-10-22 16:37:34 UTC (rev 1018) @@ -127,7 +127,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/mavenpom4redmine/src/site/en/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4redmine/src/site/en/apt/minimalpom.apt 2010-10-22 08:56:59 UTC (rev 1017) +++ trunk/mavenpom4redmine/src/site/en/apt/minimalpom.apt 2010-10-22 16:37:34 UTC (rev 1018) @@ -128,7 +128,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-22 08:56:59 UTC (rev 1017) +++ trunk/pom.xml 2010-10-22 16:37:34 UTC (rev 1018) @@ -214,16 +214,16 @@ <!-- le fichier de license du projet --> <maven.license.file>${project.basedir}/LICENSE.txt</maven.license.file> - <helper.version>1.2.8</helper.version> - <jredmine.version>1.1.4</jredmine.version> - <license.version>2.4.2-SNAPSHOT</license.version> - <jrst.version>1.1.1</jrst.version> - <skin.version>1.0.4</skin.version> - <javadoc.version>2.7</javadoc.version> - <maven.version>2.2.1</maven.version> + <helperPluginVersion>1.2.8</helperPluginVersion> + <jredminePluginVersion>1.1.4</jredminePluginVersion> + <licensePluginVersion>2.4.1</licensePluginVersion> + <jrstPluginVersion>1.1.1</jrstPluginVersion> + <nuitonSkinVersion>1.0.4</nuitonSkinVersion> + <javadocPluginVersion>2.7</javadocPluginVersion> + <mavenVersion>2.2.1</mavenVersion> - <maven-plugin-tools-javadoc.version>2.5.1</maven-plugin-tools-javadoc.version> - <plexus-component-javadoc.version>1.3.0</plexus-component-javadoc.version> + <mavenPluginToolsJavadocVersion>2.5.1</mavenPluginToolsJavadocVersion> + <plexusComponentJavadocVersion>1.3.0</plexusComponentJavadocVersion> <!-- FIX #534 unmodifiable parameter when releasing --> <helper.smtpHost>smtp</helper.smtpHost> @@ -421,24 +421,24 @@ <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> + <version>${javadocPluginVersion}</version> <configuration> <skip>${maven.javadoc.skip}</skip> <quiet>${maven.javadoc.quiet}</quiet> <charset>${project.reporting.outputEncoding}</charset> <links> - <link>http://java.sun.com/javase/6/docs/api/</link> + <link>http://download.oracle.com/javase/6/docs/api</link> </links> <tagletArtifacts> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>${maven-plugin-tools-javadoc.version}</version> + <version>${mavenPluginToolsJavadocVersion}</version> </tagletArtifact> <tagletArtifact> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-javadoc</artifactId> - <version>${plexus-component-javadoc.version}</version> + <version>${plexusComponentJavadocVersion}</version> </tagletArtifact> </tagletArtifacts> </configuration> @@ -451,7 +451,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>${skin.version}</version> + <version>${nuitonSkinVersion}</version> </dependency> </dependencies> </plugin> @@ -473,7 +473,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> </dependency> </dependencies> </plugin> @@ -554,19 +554,19 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> </plugin> <plugin> <groupId>org.nuiton.jredmine</groupId> <artifactId>maven-jredmine-plugin</artifactId> - <version>${jredmine.version}</version> + <version>${jredminePluginVersion}</version> </plugin> <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> - <version>${license.version}</version> + <version>${licensePluginVersion}</version> </plugin> </plugins> @@ -843,25 +843,25 @@ <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> + <version>${javadocPluginVersion}</version> <configuration> <skip>${maven.javadoc.skip}</skip> <quiet>${maven.javadoc.quiet}</quiet> <charset>${project.reporting.outputEncoding}</charset> <links> - <link>http://java.sun.com/javase/6/docs/api/</link> + <link>http://download.oracle.com/javase/6/docs/api</link> </links> <!--<excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames>--> <tagletArtifacts> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>${maven-plugin-tools-javadoc.version}</version> + <version>${mavenPluginToolsJavadocVersion}</version> </tagletArtifact> <tagletArtifact> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-javadoc</artifactId> - <version>${plexus-component-javadoc.version}</version> + <version>${plexusComponentJavadocVersion}</version> </tagletArtifact> </tagletArtifacts> </configuration> @@ -1326,7 +1326,7 @@ <plugin> <groupId>org.nuiton.jredmine</groupId> <artifactId>maven-jredmine-plugin</artifactId> - <version>${jredmine.version}</version> + <version>${jredminePluginVersion}</version> <configuration> <columnNames> key,summary,status,assignee,tracker,priority,version,category,createdOn @@ -1554,6 +1554,13 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <version>3.0-beta-3</version> + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-nuiton-skin</artifactId> + <version>${nuitonSkinVersion}</version> + </dependency> + </dependencies> </plugin> </plugins> </pluginManagement> Modified: trunk/src/site/apt/properties.apt =================================================================== --- trunk/src/site/apt/properties.apt 2010-10-22 08:56:59 UTC (rev 1017) +++ trunk/src/site/apt/properties.apt 2010-10-22 16:37:34 UTC (rev 1018) @@ -66,19 +66,19 @@ *--------------------------------------+--------------------------------------+ | <<Propriété>> | <<Valeur par défaut>> | *--------------------------------------+--------------------------------------+ -| {{maven.version}} | <<2.1.1>> | +| {{mavenVersion}} | <<2.1.1>> | *--------------------------------------+--------------------------------------+ -| {{helper.version}} | <<1.2.6>> | +| {{helperPluginVersion}} | <<1.2.8>> | *--------------------------------------+--------------------------------------+ -| {{jrst.version}} | <<1.1.1>> | +| {{jrstPluginVersion}} | <<1.1.1>> | *--------------------------------------+--------------------------------------+ -| {{skin.version}} | <<1.0.4>> | +| {{nuitonSkinVersion}} | <<1.0.4>> | *--------------------------------------+--------------------------------------+ -| {{jredmine.version}} | <<1.1.3>> | +| {{jredminePluginVersion}} | <<1.1.4>> | *--------------------------------------+--------------------------------------+ -| {{license.version}} | <<2.3.1>> | +| {{licensePluginVersion}} | <<2.4.1>> | *--------------------------------------+--------------------------------------+ -| {{javadoc.version}} | <<2.7>> | +| {{javadocVersion}} | <<2.7>> | *--------------------------------------+--------------------------------------+ * Propriétés de génération de site et reports @@ -215,40 +215,40 @@ * Détail des propriétés de versions -** {maven.version} +** {mavenVersion} La version de l'api de maven utilisée (principalement dans les plugins maven) : <<2.2.1>>\ {{{Propriétés de versions}[remonter]}} -** {javadoc.version} +** {javadocVersion} La version du plugin {{{http://maven.apache.org/plugins/maven-javadoc-plugin}javadoc}} à utiliser.\ {{{Propriétés de versions}[remonter]}} -** {helper.version} +** {helperPluginVersion} La version du plugin {{{http://maven-site.nuiton.org/maven-helper-plugin}maven-helper-plugin}} utilisée.\ {{{Propriétés de versions}[remonter]}} -** {jredmine.version} +** {jredminePluginVersion} La version du plugin {{{http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin}maven-jredmine-plugin}} utilisée.\ {{{Propriétés de versions}[remonter]}} -** {license.version} +** {licensePluginVersion} La version du plugin {{{http://maven-site.nuiton.org/maven-license-plugin}maven-license-plugin}} utilisée.\ {{{Propriétés de versions}[remonter]}} -** {jrst.version} +** {jrstPluginVersion} La version de {{{http://maven-site.nuiton.org/jrst}jrst}} utilisée lors de la génération du site si on utilise jrst. @@ -263,14 +263,14 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> -------------------------------------------------------------------------------- {{{Propriétés de versions}[remonter]}} -** {skin.version} +** {nuitonSkinVersion} La version de notre skin {{{http://maven-site.nuiton.org/maven-nuiton-skin}maven-nuiton-skin}} Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-10-22 08:56:59 UTC (rev 1017) +++ trunk/src/site/site_en.xml 2010-10-22 16:37:34 UTC (rev 1018) @@ -30,7 +30,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>${skin.version}</version> + <version>${nuitonSkinVersion}</version> </skin> <bannerLeft> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-10-22 08:56:59 UTC (rev 1017) +++ trunk/src/site/site_fr.xml 2010-10-22 16:37:34 UTC (rev 1018) @@ -30,7 +30,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>${skin.version}</version> + <version>${nuitonSkinVersion}</version> </skin> <bannerLeft>