Author: tchemit Date: 2009-02-17 18:15:11 +0000 (Tue, 17 Feb 2009) New Revision: 352 Modified: lutinproject/trunk/pom.xml Log: ajout de lutinmatrix.version + le plugin jrst mais uniquement en phase de release Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2009-02-17 16:59:09 UTC (rev 351) +++ lutinproject/trunk/pom.xml 2009-02-17 18:15:11 UTC (rev 352) @@ -241,7 +241,8 @@ <processor.version>0.16</processor.version> <lutinutil.version>1.0.2</lutinutil.version> <lutinwidget.version>0.12</lutinwidget.version> - + <lutinmatrix.version>1.1</lutinmatrix.version> + <javadoc.version>2.4</javadoc.version> <lutin-enforcer-rules.version>0.2</lutin-enforcer-rules.version> @@ -333,7 +334,7 @@ <plugin> <artifactId>maven-resources-plugin</artifactId> <configuration> - <encoding>${maven.compile.encoding}</encoding> + <encoding>${project.build.sourceEncoding}</encoding> </configuration> </plugin> @@ -347,7 +348,7 @@ <configuration> <source>${maven.compile.source}</source> <target>${maven.compile.target}</target> - <encoding>${maven.compile.encoding}</encoding> + <encoding>${project.build.sourceEncoding}</encoding> </configuration> </plugin> @@ -450,9 +451,9 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc.version}</version> <configuration> - <docencoding>${maven.compile.encoding}</docencoding> - <encoding>${maven.compile.encoding}</encoding> - <charset>${maven.compile.encoding}</charset> + <docencoding>${project.build.sourceEncoding}</docencoding> + <encoding>${project.build.sourceEncoding}</encoding> + <charset>${project.build.sourceEncoding}</charset> <quiet>true</quiet> <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> </configuration> @@ -484,8 +485,8 @@ <version>2.0-beta-7</version> <configuration> <siteDirectory>${maven.site.gen.dir}</siteDirectory> - <inputEncoding>${maven.compile.encoding}</inputEncoding> - <outputEncoding>${maven.compile.encoding}</outputEncoding> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> <locales>${maven.site.locales}</locales> <attach>false</attach> @@ -557,8 +558,8 @@ <version>${javadoc.version}</version> <configuration> <quiet>true</quiet> - <docencoding>${maven.compile.encoding}</docencoding> - <encoding>${maven.compile.encoding}</encoding> + <docencoding>${project.build.sourceEncoding}</docencoding> + <encoding>${project.build.sourceEncoding}</encoding> <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> </configuration> </plugin> @@ -585,7 +586,7 @@ <plugin> <artifactId>maven-checkstyle-plugin</artifactId> <configuration> - <encoding>${maven.compile.encoding}</encoding> + <encoding>${project.build.sourceEncoding}</encoding> </configuration> </plugin> @@ -593,7 +594,7 @@ <artifactId>maven-pmd-plugin</artifactId> <configuration> <linkXRef>true</linkXRef> - <sourceEncoding>${maven.compile.encoding}</sourceEncoding> + <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding> <minimumTokens>100</minimumTokens> <targetJdk>${maven.compile.target}</targetJdk> </configuration> @@ -851,6 +852,28 @@ </executions> </plugin> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <!-- on ne peut pas utiliser jrst.version car cela + pose des problèmes pendant les montées de version --> + <version>0.8.3</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </profile>