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

r970 - in trunk: . mavenpom4labs mavenpom4redmine
by hudson＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: hudson Date: 2010-08-29 16:07:13 +0200 (Sun, 29 Aug 2010) New Revision: 970 Url: http://nuiton.org/repositories/revision/mavenpom/970 Log: [maven-release-plugin] prepare release mavenpom-2.2.4 Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-08-29 14:06:30 UTC (rev 969) +++ trunk/mavenpom4labs/pom.xml 2010-08-29 14:07:13 UTC (rev 970) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.2.4</version> </parent> <artifactId>mavenpom4labs</artifactId> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2010-08-29 14:06:30 UTC (rev 969) +++ trunk/mavenpom4redmine/pom.xml 2010-08-29 14:07:13 UTC (rev 970) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.2.4</version> </parent> <artifactId>mavenpom4redmine</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:06:30 UTC (rev 969) +++ trunk/pom.xml 2010-08-29 14:07:13 UTC (rev 970) @@ -33,7 +33,7 @@ <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.2.4</version> <modules> <module>mavenpom4redmine</module> @@ -246,9 +246,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/mavenpom/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-2.2.4</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-2.2.4</developerConnection> + <url>http://www.nuiton.org/repositories/browse/mavenpom/tags/mavenpom-2.2.4</url> </scm>  @@ -1326,7 +1326,7 @@ <redmine.collectedArtifacts>target/collect-artifacts.txt</redmine.collectedArtifacts> <redmine.deploymentUrl>${repository.home.url}</redmine.deploymentUrl>  - <redmine.releaseFiles/> + <redmine.releaseFiles />  <release.repository>${central.release.repository}</release.repository>

1 0

r969 - trunk
by hudson＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: hudson Date: 2010-08-29 16:06:30 +0200 (Sun, 29 Aug 2010) New Revision: 969 Url: http://nuiton.org/repositories/revision/mavenpom/969 Log: reformat Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 13:36:51 UTC (rev 968) +++ trunk/pom.xml 2010-08-29 14:06:30 UTC (rev 969) @@ -247,8 +247,7 @@  <scm> <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk - </developerConnection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/mavenpom/trunk</url> </scm>

1 0

r968 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 15:36:51 +0200 (Sun, 29 Aug 2010) New Revision: 968 Url: http://nuiton.org/repositories/revision/mavenpom/968 Log: Evolution #829: Update maven-war-plugin to 2.1 Evolution #830: Update maven-surefire-plugin to 2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-11 14:46:39 UTC (rev 967) +++ trunk/pom.xml 2010-08-29 13:36:51 UTC (rev 968) @@ -475,7 +475,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>2.5</version> + <version>2.6</version> </plugin> <plugin> @@ -485,7 +485,7 @@ <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.1-beta-1</version> + <version>2.1</version> <configuration> <warSourceDirectory>${maven.src.dir}/main/webapp</warSourceDirectory> </configuration>

1 0

r967 - trunk
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 16:46:39 +0200 (Wed, 11 Aug 2010) New Revision: 967 Url: http://nuiton.org/repositories/revision/mavenpom/967 Log: Utilisation de mavenpom4redmine 2.2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-11 14:21:10 UTC (rev 966) +++ trunk/pom.xml 2010-08-11 14:46:39 UTC (rev 967) @@ -1327,7 +1327,7 @@ <redmine.collectedArtifacts>target/collect-artifacts.txt</redmine.collectedArtifacts> <redmine.deploymentUrl>${repository.home.url}</redmine.deploymentUrl>  - <redmine.releaseFiles /> + <redmine.releaseFiles/>  <release.repository>${central.release.repository}</release.repository>

1 0

r966 - in trunk: . mavenpom4labs mavenpom4redmine
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 16:21:10 +0200 (Wed, 11 Aug 2010) New Revision: 966 Url: http://nuiton.org/repositories/revision/mavenpom/966 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-08-11 14:21:09 UTC (rev 965) +++ trunk/mavenpom4labs/pom.xml 2010-08-11 14:21:10 UTC (rev 966) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.3</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>mavenpom4labs</artifactId> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2010-08-11 14:21:09 UTC (rev 965) +++ trunk/mavenpom4redmine/pom.xml 2010-08-11 14:21:10 UTC (rev 966) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.3</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>mavenpom4redmine</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-11 14:21:09 UTC (rev 965) +++ trunk/pom.xml 2010-08-11 14:21:10 UTC (rev 966) @@ -33,7 +33,7 @@ <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.3</version> + <version>2.2.4-SNAPSHOT</version> <modules> <module>mavenpom4redmine</module> @@ -246,10 +246,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-2.2.3</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-2.2.3 + <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/mavenpom/tags/mavenpom-2.2.3</url> + <url>http://www.nuiton.org/repositories/browse/mavenpom/trunk</url> </scm>

1 0

r965 - in tags: . mavenpom-2.2.3
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 16:21:09 +0200 (Wed, 11 Aug 2010) New Revision: 965 Url: http://nuiton.org/repositories/revision/mavenpom/965 Log: [maven-release-plugin] copy for tag mavenpom-2.2.3 Added: tags/mavenpom-2.2.3/ Property changes on: tags/mavenpom-2.2.3 ___________________________________________________________________ Added: svn:ignore + .classpath .project target THIRD-PARTY.txt catalog.xml *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/mavenpom-2.x:726-751

1 0

r964 - in trunk: . mavenpom4labs mavenpom4redmine
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 16:21:07 +0200 (Wed, 11 Aug 2010) New Revision: 964 Url: http://nuiton.org/repositories/revision/mavenpom/964 Log: [maven-release-plugin] prepare release mavenpom-2.2.3 Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-08-11 13:48:43 UTC (rev 963) +++ trunk/mavenpom4labs/pom.xml 2010-08-11 14:21:07 UTC (rev 964) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.3</version> </parent> <artifactId>mavenpom4labs</artifactId> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2010-08-11 13:48:43 UTC (rev 963) +++ trunk/mavenpom4redmine/pom.xml 2010-08-11 14:21:07 UTC (rev 964) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.3</version> </parent> <artifactId>mavenpom4redmine</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-11 13:48:43 UTC (rev 963) +++ trunk/pom.xml 2010-08-11 14:21:07 UTC (rev 964) @@ -33,7 +33,7 @@ <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.3</version> <modules> <module>mavenpom4redmine</module> @@ -246,10 +246,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-2.2.3</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-2.2.3 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/mavenpom/trunk</url> + <url>http://www.nuiton.org/repositories/browse/mavenpom/tags/mavenpom-2.2.3</url> </scm>  @@ -1327,7 +1327,7 @@ <redmine.collectedArtifacts>target/collect-artifacts.txt</redmine.collectedArtifacts> <redmine.deploymentUrl>${repository.home.url}</redmine.deploymentUrl>  - <redmine.releaseFiles/> + <redmine.releaseFiles />  <release.repository>${central.release.repository}</release.repository>

1 0

r963 - trunk/src/site
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 15:48:43 +0200 (Wed, 11 Aug 2010) New Revision: 963 Url: http://nuiton.org/repositories/revision/mavenpom/963 Log: Evolution #806: Remove maven repository on generated site Modified: trunk/src/site/site_en.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-08-11 13:21:57 UTC (rev 962) +++ trunk/src/site/site_en.xml 2010-08-11 13:48:43 UTC (rev 963) @@ -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="maven nuiton repository" href="${repository.home.url}"/> </links> <!--breadcrumbs>

1 0

r962 - in trunk: . mavenpom4redmine/src/site/apt src/site src/site/apt
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

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 @@  <scmwebeditorEnabled>true</scmwebeditorEnabled> +  + <central.release.home.url>http://maven.nuiton.org/central-releases</central.release.home.url> +  + <other.release.home.url>http://maven.nuiton.org/other-releases</other.release.home.url> +  - <repository.home.url>http://maven.nuiton.org/other-releases</repository.home.url> + <repository.home.url>${other.release.home.url}</repository.home.url>  @@ -857,14 +862,14 @@ </profile> <profile> - <id>central-safe</id> + <id>central-safe</id> <properties>  <release.repository>${central.release.repository}</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> -  + <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>

1 0

r961 - trunk
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 15:16:00 +0200 (Thu, 01 Jul 2010) New Revision: 961 Url: http://nuiton.org/repositories/revision/mavenpom/961 Log: Utilisation de mavenpom4labs 2.2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 13:09:27 UTC (rev 960) +++ trunk/pom.xml 2010-07-01 13:16:00 UTC (rev 961) @@ -1322,7 +1322,7 @@ <redmine.collectedArtifacts>target/collect-artifacts.txt</redmine.collectedArtifacts> <redmine.deploymentUrl>${repository.home.url}</redmine.deploymentUrl>  - <redmine.releaseFiles /> + <redmine.releaseFiles/>  <release.repository>${central.release.repository}</release.repository>

1 0