Author: tchemit Date: 2009-01-28 12:55:30 +0000 (Wed, 28 Jan 2009) New Revision: 320 Modified: lutinpluginproject/trunk/pom.xml lutinproject/trunk/pom.xml Log: on remet les profiles des superpom sinon on perd des infos... Modified: lutinpluginproject/trunk/pom.xml =================================================================== --- lutinpluginproject/trunk/pom.xml 2009-01-28 12:16:00 UTC (rev 319) +++ lutinpluginproject/trunk/pom.xml 2009-01-28 12:55:30 UTC (rev 320) @@ -203,9 +203,6 @@ <!-- this labs' project name : change this in your pom --> <labs.project>lutinbuilder</labs.project> - <!-- project site url --> - <!--site.home.url>http://${labs.project}.${labs.host}/${project.artifactId}</site.home.url--> - <!-- labs host --> <labs.host>labs.libre-entreprise.org</labs.host> @@ -216,7 +213,7 @@ <labs.builder.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</labs.builder.url> <!-- labs project's url --> - <site.home.url>http://${labs.project}.${labs.host}/${project.artifactId}</site.home.url> + <site.home.url>http://${labs.project}.${labs.host}</site.home.url> <!-- by default, java sources are in java 1.6 --> <maven.compile.source>1.6</maven.compile.source> @@ -260,7 +257,7 @@ <generator.version>0.63</generator.version> <lutinutil.version>1.0.2</lutinutil.version> <lutinprocessor.version>0.16</lutinprocessor.version> - <lutin-enforcer.rules.version>0.1</lutin-enforcer.rules.version> + <lutin-enforcer-rules.version>0.1</lutin-enforcer-rules.version> <javadoc.version>2.4</javadoc.version> <maven.version>2.0.9</maven.version> @@ -353,7 +350,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutin-enforcer-rules</artifactId> - <version>${lutin-enforcer.rules.version}</version> + <version>${lutin-enforcer-rules.version}</version> </dependency> </dependencies> </plugin> @@ -959,7 +956,8 @@ </profile> <!-- profile to fix site url only for the pom --> <!-- big hack : test the existance of a rst file to know if we are reaaly in the plugin ? --> - <!--profile> + <profile> + <id>internalProfile</id> <activation> <file> <exists>src/site/fr/rst/MavenPluginBestPractices.rst</exists> @@ -972,12 +970,10 @@ <url>scpexe://${labs.host}/home/groups/${labs.project}/htdocs/${project.artifactId}</url> </site> </distributionManagement> - <properties> - <labs.id>11</labs.id> - <labs.project>lutinbuilder</labs.project> + <properties> <site.home.url>http://${labs.project}.${labs.host}/${project.artifactId}</site.home.url> </properties> - </profile--> + </profile> </profiles> </project> Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2009-01-28 12:16:00 UTC (rev 319) +++ lutinproject/trunk/pom.xml 2009-01-28 12:55:30 UTC (rev 320) @@ -10,7 +10,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 --> @@ -190,7 +190,7 @@ <labs.builder.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</labs.builder.url> <!-- labs project's url --> - <site.home.url>http://${labs.project}.${labs.host}/${project.artifactId}</site.home.url> + <site.home.url>http://${labs.project}.${labs.host}</site.home.url> <!-- by default, java sources are in java 1.6 --> <maven.compile.source>1.6</maven.compile.source> @@ -235,7 +235,7 @@ <processor.version>0.16</processor.version> <lutinutil.version>1.0.2</lutinutil.version> <javadoc.version>2.4</javadoc.version> - <lutin-enforcer.rules.version>0.1</lutin-enforcer.rules.version> + <lutin-enforcer-rules.version>0.1</lutin-enforcer-rules.version> <!-- default license to use --> <license-switcher.licenseName>lgpl_v3</license-switcher.licenseName> @@ -269,19 +269,6 @@ scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${project.parent.artifactId}/trunk/${project.artifactId} </maven.scm.connection.child> - <!-- multi-module level two son pom scm properties --> - <maven.scm.url.child.child> - http://${labs.host}/plugins/scmsvn/viewcvs.php/${project.parent.parent.artifactId}/trunk/${project.parent.artifactId}/${project.artifactId}?root=${labs.project} - </maven.scm.url.child.child> - - <maven.scm.developerConnection.child.child> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${project.parent.parent.artifactId}/trunk/${project.parent.artifactId}/${project.artifactId} - </maven.scm.developerConnection.child.child> - - <maven.scm.connection.child.child> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${project.parent.parent.artifactId}/trunk/${project.parent.artifactId}/${project.artifactId} - </maven.scm.connection.child.child> - </properties> <packaging>pom</packaging> @@ -372,7 +359,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutin-enforcer-rules</artifactId> - <version>${lutin-enforcer.rules.version}</version> + <version>${lutin-enforcer-rules.version}</version> </dependency> </dependencies> </plugin> @@ -1006,8 +993,9 @@ </build> </profile> <!-- profile to fix site url only for the pom --> - <!-- big hack : test the existance of a rst file to know if we are reaaly in the plugin ? --> - <!--profile> + <!-- big hack : test the existance of a rst file to know if we are really in the plugin ? --> + <profile> + <id>internalProfile</id> <activation> <file> <exists>src/site/fr/rst/MavenProjectBestPractices.rst</exists> @@ -1020,12 +1008,10 @@ <url>scpexe://${labs.host}/home/groups/${labs.project}/htdocs/${project.artifactId}</url> </site> </distributionManagement> - <properties> - <labs.id>11</labs.id> - <labs.project>lutinbuilder</labs.project> + <properties> <site.home.url>http://${labs.project}.${labs.host}/${project.artifactId}</site.home.url> </properties> - </profile--> + </profile> </profiles> </project>