Author: tchemit Date: 2010-06-18 17:55:40 +0200 (Fri, 18 Jun 2010) New Revision: 922 Url: http://nuiton.org/repositories/revision/mavenpom/922 Log: fix site server url Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-06-18 13:59:32 UTC (rev 921) +++ trunk/mavenpom4labs/pom.xml 2010-06-18 15:55:40 UTC (rev 922) @@ -128,8 +128,9 @@ <sonar.host.url>http://hudson.nuiton.org/sonar</sonar.host.url> - <site.repository>scpexe://${platform}/home/groups/${projectId}/htdocs/</site.repository> + <!-- ceux qui utilisent mavenpom4labs sont sur le labs --> <site.server>labs</site.server> + <site.repository>scpexe://${platform}/home/groups/${projectId}/htdocs</site.repository> </properties> <packaging>pom</packaging> @@ -139,12 +140,12 @@ <!-- ************************************************************* --> <!--Distribution--> - <!--distributionManagement> + <distributionManagement> <site> - <id>labs</id> - <url>scpexe://${platform}/home/groups/${projectId}/htdocs/</url> + <id>${site.server}</id> + <url>${site.repository}</url> </site> - </distributionManagement--> + </distributionManagement> <!-- Maven Environment : profiles --> <profiles> @@ -166,9 +167,6 @@ <groupId>org.codehaus.sonar-plugins</groupId> <artifactId>maven-report</artifactId> <version>0.1</version> - <!--configuration> - <sonar.host.url>http://hudson.nuiton.org/sonar</sonar.host.url> - </configuration--> </plugin> </plugins> </reporting> @@ -191,19 +189,12 @@ <!-- enable scmwebeditor in generated site --> <scmwebeditorEnabled>true</scmwebeditorEnabled> + <!-- force to use correct site server --> <site.server>nuiton</site.server> - <site.repository>scpexe://nuiton.org/var/lib/redmine-nuiton.org/project-site/mavenpom/mavenpom4labs</site.repository> + <!-- force to use correct site location --> + <site.repository>${nuiton.site.repository}/mavenpom/mavenpom4labs</site.repository> </properties> - <!--distributionManagement> - <site> - <id>nuiton</id> - <url> - scpexe://nuiton.org/var/lib/redmine-nuiton.org/project-site/mavenpom/mavenpom4labs - </url> - </site> - </distributionManagement--> - </profile> <!-- perform only on a release stage when using the maven-release-plugin --> @@ -350,7 +341,6 @@ <!--<dryRun>${dryRun}</dryRun>--> <emailTitle>[ANN] - ${project.name} ${release.version} released</emailTitle> <emailContentFile>${emailContentFile}</emailContentFile> - <!--<emailContentFile>src/main/announcement/release-email-${release.version}.txt</emailContentFile>--> <mailSender> <name>${platform} Release Notification</name> <email>noreply@${platform}</email> @@ -359,7 +349,6 @@ <item>${listId}-users@lists.${platform}</item> <item>${listId}-devel@lists.${platform}</item> <item>announce-redmine.org@list.redmine.org</item> - <!--<item>announce-${platform}@list.${platform}</item>--> </toAddresses> <!--<smtpHost>smtp</smtpHost>--> <!-- fix bug #146 --> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2010-06-18 13:59:32 UTC (rev 921) +++ trunk/mavenpom4redmine/pom.xml 2010-06-18 15:55:40 UTC (rev 922) @@ -140,6 +140,9 @@ <sonar.host.url>http://hudson.nuiton.org/sonar</sonar.host.url> + <!-- pour casser l'héritage depuis mavenpom --> + <site.repository>${nuiton.site.repository}</site.repository> + </properties> <packaging>pom</packaging> @@ -151,12 +154,12 @@ <!--Distribution--> <distributionManagement> <site> - <id>nuiton</id> + <id>${site.server}</id> <!-- l'héritage sur les poms donnera la bonne url pour tous les poms qui héritent de ce pom (/artifactId est rajouté) mais cela ne fonctionne pas pour mavenpom lui-même (voir profile internal) --> - <url>scpexe://${platform}/var/lib/redmine-${platform}/project-site/</url> + <url>${site.repository}</url> </site> </distributionManagement> @@ -603,14 +606,10 @@ <value>true</value> </property> </activation> - <distributionManagement> - <site> - <id>nuiton</id> - <url> - scpexe://nuiton.org/var/lib/redmine-nuiton/project-site/mavenpom/mavenpom4redmine - </url> - </site> - </distributionManagement> + <properties> + <!-- force to use correct site location --> + <site.repository>${nuiton.site.repository}/mavenpom/mavenpom4redmine</site.repository> + </properties> </profile> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-18 13:59:32 UTC (rev 921) +++ trunk/pom.xml 2010-06-18 15:55:40 UTC (rev 922) @@ -284,7 +284,7 @@ <nuiton.snapshot.repository>scpexe://nuiton.org/var/lib/nexus/storage/snapshots</nuiton.snapshot.repository> <!-- location of nuiton site repository --> - <nuiton.site.repository>scpexe://nuiton.org/var/lib/redmine-${platform}/project-site/${projectId}</nuiton.site.repository> + <nuiton.site.repository>scpexe://nuiton.org/var/lib/redmine-${platform}/project-site</nuiton.site.repository> <!-- location of the release repository to use --> <release.repository>${nuiton.other.release.repository}</release.repository> @@ -315,6 +315,7 @@ <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> <!-- where to generate test sources --> + <!-- no more use since 2.2 --> <!--<maven.test.gen.dir>${project.build.directory}/generated-test-sources</maven.test.gen.dir>--> <!-- le fichier de license du projet --> @@ -675,12 +676,10 @@ <!--Distribution--> <distributionManagement> - <!-- to override use the release.repository property --> <repository> <id>${release.server}</id> <url>${release.repository}</url> </repository> - <!-- to override use the snapshot.repository property --> <snapshotRepository> <id>${snapshot.server}</id> <url>${snapshot.repository}</url> @@ -1260,7 +1259,7 @@ <redmine.releaseFiles/> <!-- deploy releases on nuiton-central-releases repository --> - <!--<release.repository>${nuiton.central.release.repository}</release.repository>--> + <site.repository>${nuiton.site.repository}/${projectId}</site.repository> </properties> <build>