Author: tchemit Date: 2008-12-15 03:02:53 +0000 (Mon, 15 Dec 2008) New Revision: 269 Modified: lutinpluginproject/trunk/changelog.txt lutinpluginproject/trunk/pom.xml lutinproject/trunk/changelog.txt lutinproject/trunk/pom.xml Log: ajout des versions de nos plugins ou librairies (a finir...) Modified: lutinpluginproject/trunk/changelog.txt =================================================================== --- lutinpluginproject/trunk/changelog.txt 2008-12-10 10:06:39 UTC (rev 268) +++ lutinpluginproject/trunk/changelog.txt 2008-12-15 03:02:53 UTC (rev 269) @@ -1,3 +1,6 @@ +3.3 ?? (200812..) + * 20081215 [chemit] - ajout des versions de nos plugins ou librairies (a finir...) + 3.2 chemit (20081204) * 20081205 [chemit] - utilisation du plugin enforcer pour faire des verifications sur le pom - amélioration des propriétés scm Modified: lutinpluginproject/trunk/pom.xml =================================================================== --- lutinpluginproject/trunk/pom.xml 2008-12-10 10:06:39 UTC (rev 268) +++ lutinpluginproject/trunk/pom.xml 2008-12-15 03:02:53 UTC (rev 269) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -198,10 +199,10 @@ <properties> <!-- the labs' project id : change this in your pom --> - <labs.id /> + <labs.id/> <!-- this labs' project name : change this in your pom --> - <labs.project /> + <labs.project/> <!-- labs host --> <labs.host>labs.libre-entreprise.org</labs.host> @@ -246,14 +247,26 @@ <maven.reports.generate>true</maven.reports.generate> <!-- version of license-switcher plugin to use --> - <license-switcher.version>0.5</license-switcher.version> + <license-switcher.version>0.6-SNAPSHOT</license-switcher.version> <!-- version of i18n plugin to use --> - <i18n.version>0.7</i18n.version> + <i18n.version>0.8-SNAPSHOT</i18n.version> <!-- version of jrst plugin to use --> <jrst.version>0.8.3</jrst.version> + <!-- version of jaxx plugin to use --> + <jaxx.version>0.8-SNAPSHOT</jaxx.version> + + <!-- topia version --> + <topia.version>2.1.1-SNAPSHOT</topia.version> + + <!-- lutingenerator version --> + <lutingenerator.version>0.63</lutingenerator.version> + + <!-- lutinprocessor version --> + <lutinprocessor.version>0.16</lutinprocessor.version> + <!-- default license to use --> <license-switcher.licenseName>lgpl_v3</license-switcher.licenseName> @@ -379,6 +392,27 @@ </configuration> </plugin> + <!-- - - - - - - - - - - - --> + <!-- PHASE GENERATE-SOURCES --> + <!-- - - - - - - - - - - - --> + + <!-- plugin jaxx --> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + <configuration> + <src>${basedir}/src/main/java</src> + </configuration> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- - - - - - - - - - - - --> <!-- PHASE PROCESS-SOURCES --> <!-- - - - - - - - - - - - --> @@ -579,7 +613,7 @@ <plugin> <artifactId>maven-enforcer-plugin</artifactId> </plugin> - + <!-- always compute javadoc jar --> <plugin> <artifactId>maven-javadoc-plugin</artifactId> @@ -611,10 +645,10 @@ <phase>pre-site</phase> <configuration> <tasks> - <mkdir dir="${maven.src.dir}/site" /> + <mkdir dir="${maven.src.dir}/site"/> <copy todir="${maven.site.gen.dir}" verbose="${maven.verbose}" overwrite="false"> <fileset dir="${maven.src.dir}/site"> - <exclude name="**/rst/**" /> + <exclude name="**/rst/**"/> </fileset> </copy> </tasks> Modified: lutinproject/trunk/changelog.txt =================================================================== --- lutinproject/trunk/changelog.txt 2008-12-10 10:06:39 UTC (rev 268) +++ lutinproject/trunk/changelog.txt 2008-12-15 03:02:53 UTC (rev 269) @@ -1,3 +1,6 @@ +3.3 ?? (200812..) + * 20081215 [chemit] - ajout des versions de nos plugins ou librairies (a finir...) + 3.2 chemit (20081204) * 20081205 [chemit] - utilisation du plugin enforcer pour faire des verifications sur le pom - amélioration des propriétés scm Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2008-12-10 10:06:39 UTC (rev 268) +++ lutinproject/trunk/pom.xml 2008-12-15 03:02:53 UTC (rev 269) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -176,10 +177,10 @@ <properties> <!-- the labs' project id : change this in your pom --> - <labs.id /> + <labs.id/> <!-- this labs' project name : change this in your pom --> - <labs.project /> + <labs.project/> <!-- labs host --> <labs.host>labs.libre-entreprise.org</labs.host> @@ -224,14 +225,26 @@ <maven.reports.generate>true</maven.reports.generate> <!-- version of license-switcher to use --> - <license-switcher.version>0.5</license-switcher.version> + <license-switcher.version>0.6-SNAPSHOT</license-switcher.version> <!-- version of i18n plugin to use --> - <i18n.version>0.7</i18n.version> + <i18n.version>0.8-SNAPSHOT</i18n.version> <!-- version of jrst plugin to use --> <jrst.version>0.8.3</jrst.version> + <!-- version of jaxx plugin to use --> + <jaxx.version>0.8-SNAPSHOT</jaxx.version> + + <!-- topia version --> + <topia.version>2.1.1</topia.version> + + <!-- lutingenerator version --> + <lutingenerator.version>0.63</lutingenerator.version> + + <!-- lutinprocessor version --> + <lutinprocessor.version>0.16</lutinprocessor.version> + <!-- default license to use --> <license-switcher.licenseName>lgpl_v3</license-switcher.licenseName> @@ -356,25 +369,32 @@ </configuration> </plugin> - <!-- - - - - - - - - - - - --> - <!-- PHASE PROCESS-SOURCES --> - <!-- - - - - - - - - - - - --> + <!-- - - - - - - - - - - - --> + <!-- PHASE GENERATE-SOURCES --> + <!-- - - - - - - - - - - - --> <!-- plugin jaxx --> - <!--plugin> + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jaxx-plugin</artifactId> <version>${jaxx.version}</version> + <configuration> + <src>${basedir}/src/main/java</src> + </configuration> <executions> <execution> - <id>generate jaxx</id> <goals> <goal>generate</goal> </goals> </execution> </executions> - </plugin--> + </plugin> + <!-- - - - - - - - - - - - --> + <!-- PHASE PROCESS-SOURCES --> + <!-- - - - - - - - - - - - --> + + <!-- - - - - - - - - - - - - --> <!-- PHASE GENERATE-RESOURCES --> <!-- - - - - - - - - - - - - --> @@ -623,10 +643,10 @@ <phase>pre-site</phase> <configuration> <tasks> - <mkdir dir="${maven.src.dir}/site" /> + <mkdir dir="${maven.src.dir}/site"/> <copy todir="${maven.site.gen.dir}" verbose="${maven.verbose}" overwrite="false"> <fileset dir="${maven.src.dir}/site"> - <exclude name="**/rst/**" /> + <exclude name="**/rst/**"/> </fileset> </copy> </tasks>