Author: tchemit Date: 2009-05-11 02:31:31 +0000 (Mon, 11 May 2009) New Revision: 197 Modified: maven-processor-plugin/trunk/changelog.txt maven-processor-plugin/trunk/pom.xml maven-processor-plugin/trunk/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java maven-processor-plugin/trunk/src/site/site.xml Log: * bump versions (lutinproject, lutinprocessor, maven-license-switcher-plugin) * improve download section on site * update site Modified: maven-processor-plugin/trunk/changelog.txt =================================================================== --- maven-processor-plugin/trunk/changelog.txt 2009-05-10 23:44:42 UTC (rev 196) +++ maven-processor-plugin/trunk/changelog.txt 2009-05-11 02:31:31 UTC (rev 197) @@ -1,3 +1,8 @@ +ver-0-18 chemit (20090511) + * bump versions (lutinproject, lutinprocessor, maven-license-switcher-plugin) + * improve download section on site + * update site + ver-0-17 chemit (20090218) * Parent is org.codelutin:lutinproject:3.4 * use same version as maven-processor-plugin Modified: maven-processor-plugin/trunk/pom.xml =================================================================== --- maven-processor-plugin/trunk/pom.xml 2009-05-10 23:44:42 UTC (rev 196) +++ maven-processor-plugin/trunk/pom.xml 2009-05-11 02:31:31 UTC (rev 197) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5.4</version> </parent> <artifactId>maven-processor-plugin</artifactId> @@ -21,14 +21,14 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinprocessor</artifactId> - <version>0.18-SNAPSHOT</version> + <version>0.18</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinpluginutil</artifactId> - <version>${lutinpluginutil.version}</version> + <version>0.5</version> <scope>compile</scope> </dependency> @@ -81,13 +81,9 @@ <packaging>maven-plugin</packaging> <properties> - <!-- id du projet du labs --> + <labs.id>28</labs.id> - - <!-- nom du projet sur le labs --> <labs.project>lutinprocessor</labs.project> - - <lutinpluginutil.version>0.3</lutinpluginutil.version> <maven.version>2.0.10</maven.version> </properties> @@ -100,7 +96,6 @@ <!-- plugin plugin --> <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.3</version> <executions> <execution> <goals> @@ -110,28 +105,29 @@ </executions> </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> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.5</version> + </plugin> + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build> <!--Site--> @@ -140,6 +136,7 @@ <!--Site report's plugin--> <plugin> <artifactId>maven-plugin-plugin</artifactId> + <version>2.5</version> </plugin> </plugins> </reporting> @@ -150,9 +147,9 @@ <!--Source control management--> <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinprocessor/maven-processor-plugin/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinprocessor/maven-processor-plugin/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-processor-plugin/trunk/?root=lutinprocessor</url> + <url>${maven.scm.url}</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> </scm> <!--Code Lutin Repository--> @@ -188,10 +185,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.6</version> - <configuration> - <licenseName>${license-switcher.licenseName}</licenseName> - </configuration> + <version>0.8</version> <executions> <execution> <id>attach-licenses</id> Modified: maven-processor-plugin/trunk/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java =================================================================== --- maven-processor-plugin/trunk/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java 2009-05-10 23:44:42 UTC (rev 196) +++ maven-processor-plugin/trunk/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java 2009-05-11 02:31:31 UTC (rev 197) @@ -130,6 +130,7 @@ */ protected boolean addCompileDirectory; + @Override public void execute() throws MojoExecutionException { getLog().info("Génération des fichiers à partir de lutin processor"); Modified: maven-processor-plugin/trunk/src/site/site.xml =================================================================== --- maven-processor-plugin/trunk/src/site/site.xml 2009-05-10 23:44:42 UTC (rev 196) +++ maven-processor-plugin/trunk/src/site/site.xml 2009-05-11 02:31:31 UTC (rev 197) @@ -1,46 +1,54 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="MavenProcessorPlugin"> +<project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> + <publishDate format="dd/MM/yyyy"/> - <skin> - <groupId>org.codelutin</groupId> - <artifactId>maven-lutin-skin</artifactId> - <version>0.2.3</version> - </skin> + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.3</version> + </skin> - <bannerLeft> - <name>Maven-Processor-Plugin</name> - </bannerLeft> + <bannerLeft> + <name>Maven-Processor-Plugin</name> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> - </poweredBy> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> + </poweredBy> - <body> - <links> - <item name="LutinProcessor" href="http://lutinprocessor.labs.libre-entreprise.org/"/> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> + <body> + <links> + <item name="LutinProcessor" href="http://lutinprocessor.labs.libre-entreprise.org/"/> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Code Lutin" href="http://www.codelutin.com/"/> + </links> - <menu name="Utilisateur"> - <item href="index.html" name="Accueil"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/org/codelutin/maven-pro..." name="Téléchargement"/> - </menu> + <menu name="Utilisateur"> + <item href="index.html" name="Accueil"/> + <item name="Goals" href="plugin-info.html"> + <item name="process" href="process-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + + <menu name="Téléchargement"> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> - <!--<menu name="Developpeur"> - <item name="Todo" href="Todo.html"/> - </menu>--> - - ${reports} + <menu ref="reports"/> - </body> + </body> </project>