January 2010 - Mavenpom-commits - mailman.cloud.codelutin.com

r771 - trunk
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 14:55:44 +0100 (Sun, 17 Jan 2010) New Revision: 771 Modified: trunk/pom.xml Log: clean config Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 13:55:02 UTC (rev 770) +++ trunk/pom.xml 2010-01-17 13:55:44 UTC (rev 771) @@ -1535,19 +1535,6 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <version>2.1</version> -  </plugin> </plugins>

1 0

r770 - trunk/mavenpom4labs
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 14:55:02 +0100 (Sun, 17 Jan 2010) New Revision: 770 Modified: trunk/mavenpom4labs/pom.xml Log: conditional copy of changelog.txt to src/site/rst/changelog only if siteSourcesType is rst Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-01-17 13:02:16 UTC (rev 769) +++ trunk/mavenpom4labs/pom.xml 2010-01-17 13:55:02 UTC (rev 770) @@ -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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -88,10 +89,11 @@ <properties> - <labs.id /> + <labs.id/> <labs.list.host>lists.${platform}</labs.list.host> +   </properties> @@ -159,6 +161,7 @@ <properties> <platform>nuiton.org</platform> +  </properties> </profile> @@ -202,17 +205,33 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> +  + <version>1.2</version> <executions>  <execution> - <id>changeLogToSite</id> + <id>copy changeLog to site</id> <phase>pre-site</phase> <configuration> <tasks> - <copy verbose="${maven.verbose}" failonerror="false" overwrite="false" file="changelog.txt" tofile="src/site/rst/changelog.rst"> +  + <taskdef resource="net/sf/antcontrib/antcontrib.properties"/> + <if> + <equals arg1="${siteSourcesType}" arg2="rst"/> + <then> + <echo message="Copy changelog.txt to src/site/rst/changelog.rst"/> + <copy verbose="${maven.verbose}" + failonerror="false" + overwrite="false" + file="changelog.txt" + tofile="src/site/rst/changelog.rst"/> + </then> + <else> + <echo message="Skip Copy changelog.txt to src/site/rst/changelog.rst (apt documentation)"/> - </copy> + </else> + </if> </tasks> </configuration> <goals> @@ -220,6 +239,13 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + </dependency> + </dependencies> </plugin> </plugins> </build> @@ -260,7 +286,6 @@ <value>true</value> </property> </activation> - </profile>

1 0

r769 - in trunk: . mavenpom4labs/src/site mavenpom4redmine/src/site src/site
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 14:02:16 +0100 (Sun, 17 Jan 2010) New Revision: 769 Modified: trunk/mavenpom4labs/src/site/site_en.xml trunk/mavenpom4labs/src/site/site_fr.xml trunk/mavenpom4redmine/src/site/site_en.xml trunk/mavenpom4redmine/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Log: Anomalie #215: les urls du breadcrumbs ne sont pas bonnes Anomalie #222: Ne pas utilisers les menus parent et modules pour le site anglais Modified: trunk/mavenpom4labs/src/site/site_en.xml =================================================================== --- trunk/mavenpom4labs/src/site/site_en.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/mavenpom4labs/src/site/site_en.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -12,21 +12,30 @@ <item name="${project.name}" href="index.html"/> </breadcrumbs> - <menu ref="parent"/> - + +  +  + <menu name="Parent Projet"> + <item name="Mavenpom" href="../../en/index.html"/> + </menu> + + <menu name="Language"> + <item name="Version française" href="/../index.html"/> + </menu> + <menu name="Inside mavenpom4labs"> <item name="Home" href="/index.html"/> <item name="Properties" href="properties.html"/> <item name="Profiles" href="profiles.html"/> </menu> + <menu name="Dev"> <item name="Make a release" href="release.html"/> <item name="Todo" href="Todo.html"/> </menu> <menu name="Links"> - <item name="mavenpom4labs (french)" href="../index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-license-plugin" href="http://maven-site.nuiton.org/maven-license-plugin"/> Modified: trunk/mavenpom4labs/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4labs/src/site/site_fr.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/mavenpom4labs/src/site/site_fr.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -13,7 +13,11 @@ </breadcrumbs> <menu ref="parent"/> - + + <menu name="Langue"> + <item name="English version" href="/en/index.html"/> + </menu> + <menu name="Inside mavenpom4labs"> <item name="Accueil" href="index.html"/> <item name="Propriétés" href="properties.html"/> @@ -26,7 +30,6 @@ </menu> <menu name="Liens"> - <item name="mavenpom4labs (english)" href="/en/index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-license-plugin" href="http://maven-site.nuiton.org/maven-license-plugin"/> Modified: trunk/mavenpom4redmine/src/site/site_en.xml =================================================================== --- trunk/mavenpom4redmine/src/site/site_en.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/mavenpom4redmine/src/site/site_en.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -9,11 +9,19 @@ <body> <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/index.html"/> </breadcrumbs> - <menu ref="parent"/> - +  +  + <menu name="Parent Projet"> + <item name="Mavenpom" href="../../en/index.html"/> + </menu> + + <menu name="Language"> + <item name="Version française" href="/../index.html"/> + </menu> + <menu name="Inside mavenpom4redmine"> <item name="Home" href="/index.html"/> <item name="Properties" href="properties.html"/> @@ -26,7 +34,6 @@ </menu> <menu name="Links"> - <item name="mavenpom4redmine (french)" href="../index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/> Modified: trunk/mavenpom4redmine/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4redmine/src/site/site_fr.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/mavenpom4redmine/src/site/site_fr.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -9,11 +9,15 @@ <body> <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/index.html"/> </breadcrumbs> <menu ref="parent"/> - + + <menu name="Langue"> + <item name="English version" href="/en/index.html"/> + </menu> + <menu name="Inside mavenpom4redmine"> <item name="Accueil" href="index.html"/> <item name="Propriétés" href="properties.html"/> @@ -26,7 +30,6 @@ </menu> <menu name="Liens"> - <item name="mavenpom4redmine (english)" href="/en/index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/pom.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -1515,10 +1515,6 @@  <redmine.releaseFiles /> -  - <dryRun>true</dryRun> - <redmine.dryRun>${dryRun}</redmine.dryRun> - </properties> <build> @@ -1536,6 +1532,24 @@ </configuration> </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.1</version> +  + </plugin> + </plugins> </pluginManagement> @@ -1672,6 +1686,12 @@ </property> </activation> + <properties> +  + <dryRun>true</dryRun> + <redmine.dryRun>${dryRun}</redmine.dryRun> + </properties> + <build> <defaultGoal>generate-sources</defaultGoal> @@ -1725,6 +1745,12 @@ </property> </activation> + <properties> +  + <dryRun>true</dryRun> + <redmine.dryRun>${dryRun}</redmine.dryRun> + </properties> + <build> <defaultGoal>generate-sources</defaultGoal> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/src/site/site_en.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -28,17 +28,26 @@ <item name="maven nuiton repository" href="${repository.home.url}"/> </links> - <breadcrumbs> +  - <menu ref="modules"/> - +  +  + <menu name="Modules"> + <item name="Mavenpom4redmine" href="../mavenpom4redmine/en/index.html"/> + <item name="Mavenpom4labs" href="../mavenpom4labs/en/index.html"/> + </menu> + + <menu name="Language"> + <item name="Version française" href="/../index.html"/> + </menu> + <menu name="Inside mavenpom"> <item name="Home" href="/index.html"/> <item name="Properties" href="properties.html"/> <item name="Profiles" href="profiles.html"/> - <item name="Plugins" href="plugins-detail.html"/> + <item name="Plugins" href="plugins-detail.html"/> </menu> <menu name="Dev"> @@ -48,7 +57,6 @@ </menu> <menu name="Links"> - <item name="mavenpom (french)" href="../index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/src/site/site_fr.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -28,12 +28,16 @@ <item name="dépôt maven" href="${repository.home.url}"/> </links> - <breadcrumbs> +  <menu ref="modules"/> - + + <menu name="Langue"> + <item name="English version" href="/en/index.html"/> + </menu> + <menu name="Inside mavenpom"> <item name="Accueil" href="index.html"/> <item name="Propriétés" href="properties.html"/> @@ -48,7 +52,6 @@ </menu> <menu name="Liens"> - <item name="mavenpom (english)" href="/en/index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/>

1 0

r768 - in trunk: . src/site
by tchemit＠users.nuiton.org 16 Jan '10

16 Jan '10

Author: tchemit Date: 2010-01-16 19:38:18 +0100 (Sat, 16 Jan 2010) New Revision: 768 Modified: trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Log: Anomalie #215: les urls du breadcrumbs ne sont pas bonnes Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-16 18:21:41 UTC (rev 767) +++ trunk/pom.xml 2010-01-16 18:38:18 UTC (rev 768) @@ -24,7 +24,7 @@ <description>Ancestor of all projects of Code Lutin</description> - <url>http://maven-site.nuiton.org/${projectId}</url> + <url>http://maven-site.nuiton.org/mavenpom</url> <inceptionYear>2009</inceptionYear> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-01-16 18:21:41 UTC (rev 767) +++ trunk/src/site/site_en.xml 2010-01-16 18:38:18 UTC (rev 768) @@ -29,7 +29,7 @@ </links> <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="http://maven-site.nuiton.org/mavenpom/index.html"/> </breadcrumbs> <menu ref="modules"/> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-01-16 18:21:41 UTC (rev 767) +++ trunk/src/site/site_fr.xml 2010-01-16 18:38:18 UTC (rev 768) @@ -29,7 +29,7 @@ </links> <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="http://maven-site.nuiton.org/mavenpom/index.html"/> </breadcrumbs> <menu ref="modules"/>

1 0

r767 - trunk
by tchemit＠users.nuiton.org 16 Jan '10

16 Jan '10

Author: tchemit Date: 2010-01-16 19:21:41 +0100 (Sat, 16 Jan 2010) New Revision: 767 Modified: trunk/pom.xml Log: Evolution #221: Utilisation maven-invoker-plugin 1.5 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-16 18:15:18 UTC (rev 766) +++ trunk/pom.xml 2010-01-16 18:21:41 UTC (rev 767) @@ -723,6 +723,11 @@ </plugin> <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <version>1.5</version> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>1.1.1</version> @@ -737,7 +742,6 @@ <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> -  <version>1.5.2</version> </plugin>

1 0

r766 - trunk
by tchemit＠users.nuiton.org 16 Jan '10

16 Jan '10

Author: tchemit Date: 2010-01-16 19:15:18 +0100 (Sat, 16 Jan 2010) New Revision: 766 Modified: trunk/pom.xml Log: Evolution #220: Utilisation plexus-component-metadata 1.5.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-16 17:56:50 UTC (rev 765) +++ trunk/pom.xml 2010-01-16 18:15:18 UTC (rev 766) @@ -737,7 +737,8 @@ <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> - <version>1.2.0</version> +  + <version>1.5.2</version> </plugin> <plugin>

1 0

r765 - trunk
by tchemit＠users.nuiton.org 16 Jan '10

16 Jan '10

Author: tchemit Date: 2010-01-16 18:56:50 +0100 (Sat, 16 Jan 2010) New Revision: 765 Modified: trunk/pom.xml Log: Evolution #219: Utilisation de buildnumber-maven-plugin 1.0-beta-4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-16 17:54:52 UTC (rev 764) +++ trunk/pom.xml 2010-01-16 17:56:50 UTC (rev 765) @@ -731,7 +731,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.0-beta-3</version> + <version>1.0-beta-4</version> </plugin> <plugin>

1 0

r764 - trunk
by tchemit＠users.nuiton.org 16 Jan '10

16 Jan '10

Author: tchemit Date: 2010-01-16 18:54:52 +0100 (Sat, 16 Jan 2010) New Revision: 764 Modified: trunk/pom.xml Log: Evolution #218: Utilisation de maven-compiler-plugin 2.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-16 17:53:05 UTC (rev 763) +++ trunk/pom.xml 2010-01-16 17:54:52 UTC (rev 764) @@ -377,7 +377,7 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>2.1</version> <configuration> <source>${maven.compile.source}</source> <target>${maven.compile.target}</target>

1 0

r763 - trunk
by tchemit＠users.nuiton.org 16 Jan '10

16 Jan '10

Author: tchemit Date: 2010-01-16 18:53:05 +0100 (Sat, 16 Jan 2010) New Revision: 763 Modified: trunk/pom.xml Log: Evolution #217: Utilisation de maven-assembly-plugin 2.2-beta-5 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-16 17:37:44 UTC (rev 762) +++ trunk/pom.xml 2010-01-16 17:53:05 UTC (rev 763) @@ -672,7 +672,7 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-4</version> + <version>2.2-beta-5</version> <dependencies> <dependency> <groupId>org.nuiton</groupId>

1 0

r762 - trunk
by tchemit＠users.nuiton.org 16 Jan '10

16 Jan '10

Author: tchemit Date: 2010-01-16 18:37:44 +0100 (Sat, 16 Jan 2010) New Revision: 762 Modified: trunk/pom.xml Log: Evolution #216: Utilisation maven-clean-plugin 2.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-15 17:01:21 UTC (rev 761) +++ trunk/pom.xml 2010-01-16 17:37:44 UTC (rev 762) @@ -688,6 +688,11 @@ </plugin> <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4</version> + </plugin> + + <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>1.0-alpha-2-cl_20091001</version>

1 0