Author: tchemit Date: 2009-01-29 13:57:21 +0000 (Thu, 29 Jan 2009) New Revision: 343 Modified: lutinpluginproject/trunk/pom.xml lutinproject/trunk/pom.xml Log: fix some problem in 3.4.1 test release go back in 3.4-SNAPSOT next real release Modified: lutinpluginproject/trunk/pom.xml =================================================================== --- lutinpluginproject/trunk/pom.xml 2009-01-28 13:29:14 UTC (rev 342) +++ lutinpluginproject/trunk/pom.xml 2009-01-29 13:57:21 UTC (rev 343) @@ -10,7 +10,7 @@ <!-- POM Relationships : Coordinates --> <groupId>org.codelutin</groupId> <artifactId>lutinpluginproject</artifactId> - <version>3.4.1-SNAPSHOT</version> + <version>3.4-SNAPSHOT</version> <!-- POM Relationships : Inheritance --> @@ -588,9 +588,6 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> <version>2.4.3</version> - <configuration> - <goalPrefix>i18n</goalPrefix> - </configuration> <executions> <execution> <goals> Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2009-01-28 13:29:14 UTC (rev 342) +++ lutinproject/trunk/pom.xml 2009-01-29 13:57:21 UTC (rev 343) @@ -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> @@ -10,7 +11,7 @@ <!-- POM Relationships : Coordinates --> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4.1-SNAPSHOT</version> + <version>3.4-SNAPSHOT</version> <!-- POM Relationships : Inheritance --> @@ -233,7 +234,7 @@ <topia.version>2.1.1</topia.version> <generator.version>0.63</generator.version> <processor.version>0.16</processor.version> - <lutinutil.version>1.0.2</lutinutil.version> + <lutinutil.version>1.0.2</lutinutil.version> <javadoc.version>2.4</javadoc.version> <lutin-enforcer-rules.version>0.2</lutin-enforcer-rules.version> @@ -243,32 +244,29 @@ <!-- pour ne pas generer la javadoc (quand on aura un javadoc 2.5 --> <maven.javadoc.skip>false</maven.javadoc.skip> - <!-- single pom or multi-module pom scm properties --> - <maven.scm.url> - http://${labs.host}/plugins/scmsvn/viewcvs.php/${project.artifactId}/trunk/?root=${labs.project} - </maven.scm.url> + <scm.url.prefix>http://${labs.host}/plugins/scmsvn/viewcvs.php</scm.url.prefix> + <scm.url.suffix>?root=${labs.project}</scm.url.suffix> - <maven.scm.developerConnection> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${project.artifactId}/trunk - </maven.scm.developerConnection> + <scm.dc.prefix>scm:svn:svn+ssh://${username}@${labs.host}</scm.dc.prefix> + <scm.c.prefix>scm:svn:svn://anonymous@${labs.host}</scm.c.prefix> + + <scm.c.suffix>svnroot/${labs.project}/${project.artifactId}/trunk</scm.c.suffix> + <scm.c.suffix.child>svnroot/${labs.project}/${project.parent.artifactId}/trunk/${project.artifactId} + </scm.c.suffix.child> - <maven.scm.connection> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${project.artifactId}/trunk - </maven.scm.connection> + <!-- single pom or multi-module pom scm properties --> + <maven.scm.url>${scm.url.prefix}/${project.artifactId}/trunk/${scm.url.suffix}</maven.scm.url> + <maven.scm.developerConnection>${scm.dc.prefix}/${scm.c.suffix}</maven.scm.developerConnection> + <maven.scm.connection>${scm.c.prefix}/${scm.c.suffix}</maven.scm.connection> <!-- multi-module level one son pom scm properties --> <maven.scm.url.child> - http://${labs.host}/plugins/scmsvn/viewcvs.php/${project.parent.artifactId}/trunk/${project.artifactId}?root=${labs.project} + ${scm.url.prefix}/${project.parent.artifactId}/trunk/${project.artifactId}/${scm.url.suffix} </maven.scm.url.child> - - <maven.scm.developerConnection.child> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${project.parent.artifactId}/trunk/${project.artifactId} + <maven.scm.developerConnection.child>${scm.dc.prefix}/${scm.c.suffix.child} </maven.scm.developerConnection.child> + <maven.scm.connection.child>${scm.c.prefix}/${scm.c.suffix.child}</maven.scm.connection.child> - <maven.scm.connection.child> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${project.parent.artifactId}/trunk/${project.artifactId} - </maven.scm.connection.child> - </properties> <packaging>pom</packaging> @@ -298,12 +296,12 @@ </resource--> <!-- this is a deprecated directory --> - <!--resource> + <resource> <directory>${maven.src.dir}/main/xsl</directory> <includes> <include>**/*.xsl</include> </includes> - </resource--> + </resource> </resources> <pluginManagement> @@ -330,8 +328,8 @@ <rules> <!-- on verifie que le labs.id et labs.name sont bien surchargés (sauf pour les project de lutinbuilder). --> - <myCustomRule implementation="org.codelutin.enforcer.CheckLabsPropertiesRule" /> - + <myCustomRule implementation="org.codelutin.enforcer.CheckLabsPropertiesRule"/> + <requireProperty> <property>labs.id</property> <regex>\d+</regex> @@ -664,10 +662,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> @@ -991,12 +989,12 @@ </plugins> </build> - </profile> + </profile> <!-- profile to fix site url only for the pom --> <!-- big hack : test the existance of a rst file to know if we are really in the plugin ? --> <profile> <id>internalProfile</id> - <activation> + <activation> <file> <exists>src/site/fr/rst/MavenProjectBestPractices.rst</exists> </file> @@ -1008,7 +1006,7 @@ <url>scpexe://${labs.host}/home/groups/${labs.project}/htdocs/${project.artifactId}</url> </site> </distributionManagement> - <properties> + <properties> <site.home.url>http://${labs.project}.${labs.host}/${project.artifactId}</site.home.url> </properties> </profile>