Author: tchemit Date: 2010-08-11 15:21:57 +0200 (Wed, 11 Aug 2010) New Revision: 962 Url: http://nuiton.org/repositories/revision/mavenpom/962 Log: Anomalie #753: Central safe projects are not ok in release announcement Evolution #805: Make mavenpom fully compatible with maven 3 Evolution #806: Remove maven repository on generated site Modified: trunk/mavenpom4redmine/src/site/apt/release.apt trunk/pom.xml trunk/src/site/apt/properties.apt trunk/src/site/site_fr.xml Modified: trunk/mavenpom4redmine/src/site/apt/release.apt =================================================================== --- trunk/mavenpom4redmine/src/site/apt/release.apt 2010-07-01 13:16:00 UTC (rev 961) +++ trunk/mavenpom4redmine/src/site/apt/release.apt 2010-08-11 13:21:57 UTC (rev 962) @@ -65,13 +65,13 @@ La commande suivante simule (sans rien déployer) -------------------------------------------------------------------------------- -mvn -DperformRedminePreRelease -N +mvn -DperformRedminePreRelease -N [-Pcentral-safe] -------------------------------------------------------------------------------- Si aucune erreur lors de l'execution, on lance la commande suivante -------------------------------------------------------------------------------- -mvn -DperformRedminePreRelease -DdryRun=false -N +mvn -DperformRedminePreRelease -DdryRun=false -N [-Pcentral-safe] -------------------------------------------------------------------------------- A ce stade, les annonces ont été créées ici : @@ -81,6 +81,8 @@ target/generated-sources/announcement/release-email-announcement.vm -------------------------------------------------------------------------------- + Pour les projets central safe, on doit ajouter le <<-Pcentral-safe>>. + Etape 3 On finalise la release après avoir modifié les annonces (si nécessaire) : Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 13:16:00 UTC (rev 961) +++ trunk/pom.xml 2010-08-11 13:21:57 UTC (rev 962) @@ -363,8 +363,13 @@ <!-- enable or disable scmwebeditor in generated site --> <scmwebeditorEnabled>true</scmwebeditorEnabled> + <!-- central releases url --> + <central.release.home.url>http://maven.nuiton.org/central-releases</central.release.home.url> + <!-- other releases url --> + <other.release.home.url>http://maven.nuiton.org/other-releases</other.release.home.url> + <!-- release repository url (to be used in site.xml, by default use other-release repository) --> - <repository.home.url>http://maven.nuiton.org/other-releases</repository.home.url> + <repository.home.url>${other.release.home.url}</repository.home.url> <!-- release configuration --> @@ -857,14 +862,14 @@ </profile> <profile> - <id>central-safe</id> + <id>central-safe</id> <properties> <!-- deploy releases on central-releases repository --> <release.repository>${central.release.repository}</release.repository> <!-- release repository url (to be used in site.xml, by default use other-release repository) --> - <repository.home.url>http://maven.nuiton.org/central-releases</repository.home.url> + <repository.home.url>${central.release.home.url}</repository.home.url> </properties> @@ -1644,29 +1649,30 @@ <exists>${basedir}</exists> </file> </activation> - <!--build> + <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.0-beta-1-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> - <version>2.1</version> - </dependency> - </dependencies> + <version>3.0-beta-1</version> </plugin> </plugins> </pluginManagement> - </build--> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <executions> + <execution> + <id>attach-descriptor</id> + <goals> + <goal>attach-descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </profile> </profiles> Modified: trunk/src/site/apt/properties.apt =================================================================== --- trunk/src/site/apt/properties.apt 2010-07-01 13:16:00 UTC (rev 961) +++ trunk/src/site/apt/properties.apt 2010-08-11 13:21:57 UTC (rev 962) @@ -90,8 +90,12 @@ *--------------------------------------+--------------------------------------------------------+ | {{scmwebeditorEnabled}} | <<true>> | *--------------------------------------+--------------------------------------------------------+ -| {{repository.home.url}} | <<http://maven.nuiton.org/other-releases>> | +| {{central.release.home.url}} | <<http://maven.nuiton.org/central-releases>> | *--------------------------------------+--------------------------------------------------------+ +| {{other.release.home.url}} | <<http://maven.nuiton.org/other-releases>> | +*--------------------------------------+--------------------------------------------------------+ +| {{repository.home.url}} | <<(other.release.home.url)>> | +*--------------------------------------+--------------------------------------------------------+ | {{scmwebeditorUrl}} | <<http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor>>| *--------------------------------------+--------------------------------------------------------+ | {{maven.javadoc.skip}} | <<false>> | @@ -118,7 +122,7 @@ *--------------------------------------+--------------------------------------------------------+ | {{central.release.repository}}| <<scpexe://nuiton.org/var/lib/nexus/storage/central-releases>>| *--------------------------------------+--------------------------------------------------------+ -| {{site.repository}} | <<(our.site.repository)>> | +| {{site.repository}} | <<(our.site.repository)>> | *--------------------------------------+--------------------------------------------------------+ | {{site.server}} | <<nuiton>> | *--------------------------------------+--------------------------------------------------------+ @@ -281,6 +285,14 @@ (<<apt>> ou <<rst>>) (par défaut <<rst>>).\ {{{Propriétés de génération de site et reports}[remonter]}} +** {central.release.home.url} + + L'url du dépôt des releases dite central-safe. + +** {other.release.home.url} + + L'url du dépôt des releases dite none central-safe. + ** {repository.home.url} L'url du dépôt maven de release du projet. Par défault on utilise Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-07-01 13:16:00 UTC (rev 961) +++ trunk/src/site/site_fr.xml 2010-08-11 13:21:57 UTC (rev 962) @@ -49,7 +49,6 @@ <item name="Nuiton" href="http://www.nuiton.org"/> <item name="Labs" href="http://labs.libre-entreprise.org/"/> <item name="${project.organization.name}" href="${project.organization.url}"/> - <item name="dépôt maven" href="${repository.home.url}"/> </links> <!--breadcrumbs>