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

r710 - trunk
by tchemit＠users.nuiton.org Dec. 9, 2009

Dec. 9, 2009

Author: tchemit Date: 2009-12-09 22:37:43 +0100 (Wed, 09 Dec 2009) New Revision: 710 Modified: trunk/pom.xml Log: evolution #147 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-07 15:34:13 UTC (rev 709) +++ trunk/pom.xml 2009-12-09 21:37:43 UTC (rev 710) @@ -1096,7 +1096,7 @@  <runOnce>true</runOnce> - <emailTitle>[ANNOUNCEMENT] - ${project.name} ${project.version} released</emailTitle> + <emailTitle>[ANN] - ${project.name} ${project.version} released</emailTitle> <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm </emailContentFile> <mailSender> @@ -1219,7 +1219,7 @@ </execution> </executions> <configuration> - +  <runOnce>true</runOnce>

1 0

r709 - trunk
by tchemit＠users.nuiton.org Dec. 7, 2009

Dec. 7, 2009

Author: tchemit Date: 2009-12-07 16:34:13 +0100 (Mon, 07 Dec 2009) New Revision: 709 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-07 15:34:10 UTC (rev 708) +++ trunk/pom.xml 2009-12-07 15:34:13 UTC (rev 709) @@ -10,7 +10,7 @@  <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version>  @@ -785,9 +785,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-1.1.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-1.1.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/mavenpom/tags/mavenpom-1.1.1</url> + <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> </scm>

1 0

r708 - in tags: . mavenpom-1.1.1
by tchemit＠users.nuiton.org Dec. 7, 2009

Dec. 7, 2009

Author: tchemit Date: 2009-12-07 16:34:10 +0100 (Mon, 07 Dec 2009) New Revision: 708 Added: tags/mavenpom-1.1.1/ Log: [maven-scm] copy for tag mavenpom-1.1.1 Property changes on: tags/mavenpom-1.1.1 ___________________________________________________________________ Added: svn:ignore + .classpath .project target THIRD-PARTY.txt catalog.xml *.iml *.ipr *.iws Added: svn:mergeinfo +

1 0

r707 - trunk
by tchemit＠users.nuiton.org Dec. 7, 2009

Dec. 7, 2009

Author: tchemit Date: 2009-12-07 16:34:06 +0100 (Mon, 07 Dec 2009) New Revision: 707 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release mavenpom-1.1.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-07 15:33:31 UTC (rev 706) +++ trunk/pom.xml 2009-12-07 15:34:06 UTC (rev 707) @@ -1,6 +1,5 @@ <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +10,7 @@  <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version>  @@ -271,7 +270,7 @@ <redmine.collectedFiles>target/collect.properties</redmine.collectedFiles>  - <redmine.releaseFiles/> + <redmine.releaseFiles />  <redmine.includeAttached>false</redmine.includeAttached> @@ -786,9 +785,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-1.1.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-1.1.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/mavenpom/tags/mavenpom-1.1.1</url> </scm>

1 0

r706 - trunk
by tchemit＠users.nuiton.org Dec. 7, 2009

Dec. 7, 2009

Author: tchemit Date: 2009-12-07 16:33:31 +0100 (Mon, 07 Dec 2009) New Revision: 706 Modified: trunk/pom.xml Log: bump versions before release Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-25 15:06:07 UTC (rev 705) +++ trunk/pom.xml 2009-12-07 15:33:31 UTC (rev 706) @@ -249,11 +249,11 @@ <maven.javadoc.quiet>true</maven.javadoc.quiet> <maven.version>2.2.1</maven.version> - <helper.version>1.1.1-SNAPSHOT</helper.version> - <jredmine.version>1.0.1-SNAPSHOT</jredmine.version> + <helper.version>1.1.0</helper.version> + <jredmine.version>1.0.1</jredmine.version> <license.version>2.0.0</license.version> <jrst.version>1.0.0</jrst.version> - <skin.version>1.0.1-SNAPSHOT</skin.version> + <skin.version>1.0.1</skin.version>  <license.licenseName>lgpl_v3</license.licenseName>

1 0

r705 - in trunk: . src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org Nov. 25, 2009

Nov. 25, 2009

Author: tchemit Date: 2009-11-25 16:06:07 +0100 (Wed, 25 Nov 2009) New Revision: 705 Modified: trunk/pom.xml trunk/src/site/apt/profiles.apt trunk/src/site/en/apt/profiles.apt Log: add a staging-site-profile profile to deploy the maven site on local Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-25 07:46:09 UTC (rev 704) +++ trunk/pom.xml 2009-11-25 15:06:07 UTC (rev 705) @@ -238,7 +238,7 @@  <maven.reports.dependencyLocationsEnabled>true</maven.reports.dependencyLocationsEnabled> - +  <javadoc.version>2.5</javadoc.version> @@ -1485,51 +1485,32 @@ <redmine.releaseFiles>src/site/site_fr.xml,src/site/site_en.xml</redmine.releaseFiles> </properties> -  </profile> - <profile> + <profile> <id>testSCM</id> <properties> - <scmwebeditorUrl>http://localhost:8080/scmwebeditor-0.0.1-SNAPSHOT/scmwebeditor</scmwebeditorUrl> + <scmwebeditorUrl>http://localhost:8080/scmwebeditor-0.0.1-SNAPSHOT/scmwebeditor</scmwebeditorUrl> </properties> + </profile> -  +  + <profile> + <id>staging-site-profile</id> + <activation> + <property> + <name>stagingSite</name> + <value>true</value> + </property> + </activation> + <properties> + <stagingUrl>scpexe://localhost/var/www/maven-staging-site</stagingUrl> + </properties> + <distributionManagement> + <site> + <id>staging-site</id> + <url>${stagingUrl}</url> + </site> + </distributionManagement> </profile> <!--<profile> Modified: trunk/src/site/apt/profiles.apt =================================================================== --- trunk/src/site/apt/profiles.apt 2009-11-25 07:46:09 UTC (rev 704) +++ trunk/src/site/apt/profiles.apt 2009-11-25 15:06:07 UTC (rev 705) @@ -39,6 +39,8 @@ *----------------------------------+---------------------------+ | {{update-jaxx-header}} | <<updateJaxxHeader>> | *----------------------------------+---------------------------+ +| {{staging-site-profile}} | <<stagingSite>> | +*----------------------------------+---------------------------+ | {{internal}} | <<UTF-8>> | *----------------------------------+---------------------------+ @@ -205,7 +207,25 @@ mvn -DupdateJaxxHeader -------------------------------------------------------------------------------- +* {staging-site-profile} + Ce profile permet de deployer un site en local, pratique pour tester les sites multi-modules sans avoir + à deployer sur un serveur distant. + + Le profile utilise un server <<staging-site>> à définir dans votre <settings.xml>. + + Il est possible de définir en ligne de commande l'url où deployer via la propriété <<stagingUrl>>. + + -------------------------------------------------------------------------------- + mvn -Pstaging-site-profile -DstagingUrl=scpexe://myServer/myPath + -------------------------------------------------------------------------------- + + ou + + -------------------------------------------------------------------------------- + mvn -DstagingSite -DstagingUrl=scpexe://myServer/myPath + -------------------------------------------------------------------------------- + * {internal} Ce profile permet de corriger l'url de deployement du site de <mavenpom> Modified: trunk/src/site/en/apt/profiles.apt =================================================================== --- trunk/src/site/en/apt/profiles.apt 2009-11-25 07:46:09 UTC (rev 704) +++ trunk/src/site/en/apt/profiles.apt 2009-11-25 15:06:07 UTC (rev 705) @@ -38,6 +38,8 @@ *----------------------------------+---------------------------+ | {{update-jaxx-header}} | <<updateJaxxHeader>> | *----------------------------------+---------------------------+ +| {{staging-site-profile}} | <<stagingSite>> | +*----------------------------------+---------------------------+ | {{internal}} | <<UTF-8>> | *----------------------------------+---------------------------+ @@ -201,6 +203,24 @@ mvn -DupdateJaxxHeader -------------------------------------------------------------------------------- +* {staging-site-profile} + + This profile allows you to deploy a site in a staging directory. + + The profile use a server named <<staging-site>> to be defined in your <settings.xml>. + + It is possible to define the deployment url via the property <<stagingUrl>>. + + -------------------------------------------------------------------------------- + mvn -Pstaging-site-profile -DstagingUrl=scpexe://myServer/myPath + -------------------------------------------------------------------------------- + + ou + + -------------------------------------------------------------------------------- + mvn -DstagingSite -DstagingUrl=scpexe://myServer/myPath + -------------------------------------------------------------------------------- + * {internal} This profile permits to fix the site url of the <mavenpom> project.

1 0

r704 - trunk
by tchemit＠users.nuiton.org Nov. 25, 2009

Nov. 25, 2009

Author: tchemit Date: 2009-11-25 08:46:09 +0100 (Wed, 25 Nov 2009) New Revision: 704 Modified: trunk/pom.xml Log: use maven-jar-plugin 2.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-24 23:02:27 UTC (rev 703) +++ trunk/pom.xml 2009-11-25 07:46:09 UTC (rev 704) @@ -399,7 +399,7 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> + <version>2.3</version> <inherited>true</inherited> <configuration>

1 0

r703 - in trunk: . src/site src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org Nov. 24, 2009

Nov. 24, 2009

Author: tchemit Date: 2009-11-25 00:02:27 +0100 (Wed, 25 Nov 2009) New Revision: 703 Added: trunk/src/site/apt/ Removed: trunk/src/site/fr/ Modified: trunk/pom.xml trunk/src/site/apt/properties.apt trunk/src/site/en/apt/properties.apt trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Log: - add scmwebeditorUrl and defaultLocale property - go back to classic maven-site-plugin since We can deal with maven site directory layout in scmwebeditor now - site is going back to classic directory layout... Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-24 16:44:47 UTC (rev 702) +++ trunk/pom.xml 2009-11-24 23:02:27 UTC (rev 703) @@ -212,6 +212,12 @@  <siteSourcesType>rst</siteSourcesType> +  + <defaultLocale>fr</defaultLocale> + +  + <scmwebeditorUrl>http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor</scmwebeditorUrl> +  <maven.license.file>${project.basedir}/LICENSE.txt</maven.license.file> @@ -431,15 +437,15 @@ <plugin> <artifactId>maven-site-plugin</artifactId> - <version>2.0.1-cl_20091107</version> -  +  + <version>2.0.1</version> <configuration> <inputEncoding>${project.reporting.outputEncoding}</inputEncoding> <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> <locales>${maven.site.locales}</locales>  - <symetricLayout>true</symetricLayout> +  </configuration> <dependencies> <dependency> @@ -1479,7 +1485,7 @@ <redmine.releaseFiles>src/site/site_fr.xml,src/site/site_en.xml</redmine.releaseFiles> </properties> - <build> +  </profile> + <profile> + <id>testSCM</id> + <properties> + <scmwebeditorUrl>http://localhost:8080/scmwebeditor-0.0.1-SNAPSHOT/scmwebeditor</scmwebeditorUrl> + </properties> +  + </profile> + <!--<profile> <id>reporting</id> <activation> Modified: trunk/src/site/apt/properties.apt =================================================================== --- trunk/src/site/fr/apt/properties.apt 2009-11-24 16:44:47 UTC (rev 702) +++ trunk/src/site/apt/properties.apt 2009-11-24 23:02:27 UTC (rev 703) @@ -41,6 +41,10 @@ *----------------------------------------------+--------------------------------------------------------+ | {{siteSourcesType}} | <<rst>> | *----------------------------------------------+--------------------------------------------------------+ +| {{defaultLocale}} | <<fr>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{scmwebeditorUrl}} | <<http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor>>| +*----------------------------------------------+--------------------------------------------------------+ | {{maven.license.file}} | <<${project.basedir}/LICENSE.txt>> | *----------------------------------------------+--------------------------------------------------------+ | {{maven.test.testFailureIgnore}} | <<false>> | @@ -180,6 +184,14 @@ Le type de fichiers utilisé pour écrire la documentation du site (<<apt>> ou <<rst>>) (par défaut <<rst>>) +* {defaultLocale} + + La locale par défaut à utiliser dans les sites générés (utilisé par scmwebeditor) (il s'agit de la première locale de {{maven.site.locales}}).. + +* {scmwebeditorUrl} + + L'url de l'application scmwebeditor. + * {maven.license.file} Chemin vers la license utilisée dans le projet Modified: trunk/src/site/en/apt/properties.apt =================================================================== --- trunk/src/site/en/apt/properties.apt 2009-11-24 16:44:47 UTC (rev 702) +++ trunk/src/site/en/apt/properties.apt 2009-11-24 23:02:27 UTC (rev 703) @@ -38,8 +38,12 @@ *----------------------------------------------+--------------------------------------------------------+ | {{maven.site.locales}} | <<fr>> | *----------------------------------------------+--------------------------------------------------------+ -| {{siteSourcesType}} | <<rst>> | +| {{siteSourcesType}} | <<rst>> | *----------------------------------------------+--------------------------------------------------------+ +| {{defaultLocale}} | <<fr>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{scmwebeditorUrl}} | <<http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor>>| +*----------------------------------------------+--------------------------------------------------------+ | {{maven.license.file}} | <<${project.basedir}/LICENSE.txt>> | *----------------------------------------------+--------------------------------------------------------+ | {{maven.test.testFailureIgnore}} | <<false>> | @@ -177,6 +181,15 @@ Type of files used to write the site documentation (<<apt>> ou <<rst>>) (by default <<rst>>) + +* {defaultLocale} + + Default locale used in site (used by scmwebeditor) (this is the first locale of {{maven.site.locales}}). + +* {scmwebeditorUrl} + + Url of scmwebeditor application. + * {maven.license.file} Path to license file Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2009-11-24 16:44:47 UTC (rev 702) +++ trunk/src/site/site_en.xml 2009-11-24 23:02:27 UTC (rev 703) @@ -45,7 +45,7 @@ </menu> <menu name="Links"> - <item name="mavenpom (french)" href="../fr/index.html"/> + <item name="mavenpom (french)" href="../index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2009-11-24 16:44:47 UTC (rev 702) +++ trunk/src/site/site_fr.xml 2009-11-24 23:02:27 UTC (rev 703) @@ -45,7 +45,7 @@ </menu> <menu name="Liens"> - <item name="mavenpom (english)" href="../en/index.html"/> + <item name="mavenpom (english)" href="/en/index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/>

1 0

r702 - trunk
by tchemit＠users.nuiton.org Nov. 24, 2009

Nov. 24, 2009

Author: tchemit Date: 2009-11-24 17:44:47 +0100 (Tue, 24 Nov 2009) New Revision: 702 Modified: trunk/pom.xml Log: use maven-changes-plugin 2.2 (with french translations :)) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-24 15:31:18 UTC (rev 701) +++ trunk/pom.xml 2009-11-24 16:44:47 UTC (rev 702) @@ -655,7 +655,7 @@  <plugin> <artifactId>maven-changes-plugin</artifactId> - <version>2.1</version> + <version>2.2</version> <configuration> <issueLinkTemplatePerSystem> <redmine>${redmine.issueLinkTemplate}</redmine>

1 0

r701 - in trunk: . src/site/en/apt src/site/fr/apt
by tchemit＠users.nuiton.org Nov. 24, 2009

Nov. 24, 2009

Author: tchemit Date: 2009-11-24 16:31:18 +0100 (Tue, 24 Nov 2009) New Revision: 701 Modified: trunk/pom.xml trunk/src/site/en/apt/properties.apt trunk/src/site/fr/apt/properties.apt Log: introduce property siteSourcesType (to be used by scmwebeditor in maven-nuiton-skin) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-24 14:54:02 UTC (rev 700) +++ trunk/pom.xml 2009-11-24 15:31:18 UTC (rev 701) @@ -209,6 +209,9 @@  <maven.site.locales>fr</maven.site.locales> +  + <siteSourcesType>rst</siteSourcesType> +  <maven.license.file>${project.basedir}/LICENSE.txt</maven.license.file> @@ -229,7 +232,7 @@  <maven.reports.dependencyLocationsEnabled>true</maven.reports.dependencyLocationsEnabled> - +  <javadoc.version>2.5</javadoc.version> @@ -1472,6 +1475,7 @@ </distributionManagement> <properties> <maven.site.locales>fr,en</maven.site.locales> + <siteSourcesType>apt</siteSourcesType> <redmine.releaseFiles>src/site/site_fr.xml,src/site/site_en.xml</redmine.releaseFiles> </properties> Modified: trunk/src/site/en/apt/properties.apt =================================================================== --- trunk/src/site/en/apt/properties.apt 2009-11-24 14:54:02 UTC (rev 700) +++ trunk/src/site/en/apt/properties.apt 2009-11-24 15:31:18 UTC (rev 701) @@ -38,6 +38,8 @@ *----------------------------------------------+--------------------------------------------------------+ | {{maven.site.locales}} | <<fr>> | *----------------------------------------------+--------------------------------------------------------+ +| {{siteSourcesType}} | <<rst>> | +*----------------------------------------------+--------------------------------------------------------+ | {{maven.license.file}} | <<${project.basedir}/LICENSE.txt>> | *----------------------------------------------+--------------------------------------------------------+ | {{maven.test.testFailureIgnore}} | <<false>> | @@ -171,6 +173,10 @@ Locales used in site generation (by default <<fr>>) +* {siteSourcesType} + + Type of files used to write the site documentation (<<apt>> ou <<rst>>) (by default <<rst>>) + * {maven.license.file} Path to license file Modified: trunk/src/site/fr/apt/properties.apt =================================================================== --- trunk/src/site/fr/apt/properties.apt 2009-11-24 14:54:02 UTC (rev 700) +++ trunk/src/site/fr/apt/properties.apt 2009-11-24 15:31:18 UTC (rev 701) @@ -39,6 +39,8 @@ *----------------------------------------------+--------------------------------------------------------+ | {{maven.site.locales}} | <<fr>> | *----------------------------------------------+--------------------------------------------------------+ +| {{siteSourcesType}} | <<rst>> | +*----------------------------------------------+--------------------------------------------------------+ | {{maven.license.file}} | <<${project.basedir}/LICENSE.txt>> | *----------------------------------------------+--------------------------------------------------------+ | {{maven.test.testFailureIgnore}} | <<false>> | @@ -174,6 +176,10 @@ Locales utilisées pour la génération des sites (par défaut <<fr>>) +* {siteSourcesType} + + Le type de fichiers utilisé pour écrire la documentation du site (<<apt>> ou <<rst>>) (par défaut <<rst>>) + * {maven.license.file} Chemin vers la license utilisée dans le projet

1 0