Author: tchemit Date: 2009-04-29 08:05:44 +0000 (Wed, 29 Apr 2009) New Revision: 1363 Modified: guix/trunk/pom.xml Log: quelques modifs sur le pom : - pas de dependence direct dans super-pom - utilisation doxia plutot que jrst-plugin - bump versions Modified: guix/trunk/pom.xml =================================================================== --- guix/trunk/pom.xml 2009-04-27 16:13:24 UTC (rev 1362) +++ guix/trunk/pom.xml 2009-04-29 08:05:44 UTC (rev 1363) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5.3</version> </parent> <groupId>org.nuiton.guix</groupId> @@ -21,14 +21,14 @@ <module>guix-compiler</module> <module>guix-maven-plugin</module> <module>guix-test</module> - </modules> + </modules> - <dependencies> + <!--dependencies> <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> </dependency> - </dependencies> + </dependencies--> <dependencyManagement> <dependencies> @@ -83,14 +83,14 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>2.0.4</version> + <version>${maven.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>2.0.4</version> + <version>${maven.version}</version> <scope>compile</scope> </dependency> @@ -137,10 +137,11 @@ <labs.project>buix</labs.project> <!-- libs version --> - <lutinutil.version>1.0.3</lutinutil.version> + <lutinutil.version>1.0.4</lutinutil.version> <guix.version>${project.version}</guix.version> - <i18n.version>0.10</i18n.version> - <lutinpluginutil.version>0.3</lutinpluginutil.version> + <i18n.version>0.11</i18n.version> + <lutinpluginutil.version>0.4</lutinpluginutil.version> + <maven.version>2.0.10</maven.version> </properties> <build> @@ -160,38 +161,25 @@ <version>2.4.3</version> </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <locales>fr</locales> + <siteDirectory>src/site</siteDirectory> + </configuration> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> </plugins> </pluginManagement> <plugins> - <!--plugin> - <groupId>org.codelutin.guix</groupId> - <artifactId>guix-maven-plugin</artifactId> - <version>${project.version}</version> - </plugin--> - - <!-- Always process jrst files, but only called on pre-site phase --> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.4</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>