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

r1170 - trunk
by maven-release＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: maven-release Date: 2011-09-09 17:53:04 +0200 (Fri, 09 Sep 2011) New Revision: 1170 Url: http://nuiton.org/repositories/revision/mavenpom/1170 Log: Update mavenpom4redmineAndCentral to 3.0.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 15:36:28 UTC (rev 1169) +++ trunk/pom.xml 2011-09-09 15:53:04 UTC (rev 1170) @@ -490,7 +490,7 @@ <phase>generate-test-sources</phase> <configuration> <target> - <mkdir dir="${basedir}/target/surefire-workdir" /> + <mkdir dir="${basedir}/target/surefire-workdir"/> </target> </configuration> <goals> @@ -1520,7 +1520,7 @@ </redmine.templateDirectory>  - <redmine.releaseFiles /> + <redmine.releaseFiles/> </properties>

1 0

r1169 - in trunk: . mavenpom4labs mavenpom4redmine mavenpom4redmine/mavenpom4redmineAndCentral
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 17:36:28 +0200 (Fri, 09 Sep 2011) New Revision: 1169 Url: http://nuiton.org/repositories/revision/mavenpom/1169 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2011-09-09 15:36:26 UTC (rev 1168) +++ trunk/mavenpom4labs/pom.xml 2011-09-09 15:36:28 UTC (rev 1169) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>3.0.3</version> + <version>3.0.4-SNAPSHOT</version> </parent> <artifactId>mavenpom4labs</artifactId> Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 15:36:26 UTC (rev 1168) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 15:36:28 UTC (rev 1169) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.3</version> + <version>3.0.4-SNAPSHOT</version> </parent> <artifactId>mavenpom4redmineAndCentral</artifactId> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2011-09-09 15:36:26 UTC (rev 1168) +++ trunk/mavenpom4redmine/pom.xml 2011-09-09 15:36:28 UTC (rev 1169) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>3.0.3</version> + <version>3.0.4-SNAPSHOT</version> </parent> <artifactId>mavenpom4redmine</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 15:36:26 UTC (rev 1168) +++ trunk/pom.xml 2011-09-09 15:36:28 UTC (rev 1169) @@ -33,7 +33,7 @@ <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>3.0.3</version> + <version>3.0.4-SNAPSHOT</version> <modules> <module>mavenpom4redmine</module> @@ -159,9 +159,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-3.0.3</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-3.0.3</developerConnection> - <url>http://www.nuiton.org/repositories/browse/mavenpom/tags/mavenpom-3.0.3</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

r1168 - in tags: . mavenpom-3.0.3
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 17:36:26 +0200 (Fri, 09 Sep 2011) New Revision: 1168 Url: http://nuiton.org/repositories/revision/mavenpom/1168 Log: [maven-release-plugin] copy for tag mavenpom-3.0.3 Added: tags/mavenpom-3.0.3/ Property changes on: tags/mavenpom-3.0.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

r1167 - in trunk: . mavenpom4labs mavenpom4redmine mavenpom4redmine/mavenpom4redmineAndCentral
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 17:36:23 +0200 (Fri, 09 Sep 2011) New Revision: 1167 Url: http://nuiton.org/repositories/revision/mavenpom/1167 Log: [maven-release-plugin] prepare release mavenpom-3.0.3 Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2011-09-09 15:34:12 UTC (rev 1166) +++ trunk/mavenpom4labs/pom.xml 2011-09-09 15:36:23 UTC (rev 1167) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>3.0.3-SNAPSHOT</version> + <version>3.0.3</version> </parent> <artifactId>mavenpom4labs</artifactId> Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 15:34:12 UTC (rev 1166) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 15:36:23 UTC (rev 1167) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.3-SNAPSHOT</version> + <version>3.0.3</version> </parent> <artifactId>mavenpom4redmineAndCentral</artifactId> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2011-09-09 15:34:12 UTC (rev 1166) +++ trunk/mavenpom4redmine/pom.xml 2011-09-09 15:36:23 UTC (rev 1167) @@ -23,9 +23,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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> @@ -36,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>3.0.3-SNAPSHOT</version> + <version>3.0.3</version> </parent> <artifactId>mavenpom4redmine</artifactId> @@ -147,7 +145,7 @@ </redmine.templateDirectory>  - <redmine.releaseFiles/> + <redmine.releaseFiles />  <redmine.libReleaseFiles> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 15:34:12 UTC (rev 1166) +++ trunk/pom.xml 2011-09-09 15:36:23 UTC (rev 1167) @@ -33,7 +33,7 @@ <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>3.0.3-SNAPSHOT</version> + <version>3.0.3</version> <modules> <module>mavenpom4redmine</module> @@ -159,9 +159,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-3.0.3</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-3.0.3</developerConnection> + <url>http://www.nuiton.org/repositories/browse/mavenpom/tags/mavenpom-3.0.3</url> </scm>  @@ -490,7 +490,7 @@ <phase>generate-test-sources</phase> <configuration> <target> - <mkdir dir="${basedir}/target/surefire-workdir"/> + <mkdir dir="${basedir}/target/surefire-workdir" /> </target> </configuration> <goals> @@ -1520,7 +1520,7 @@ </redmine.templateDirectory>  - <redmine.releaseFiles/> + <redmine.releaseFiles /> </properties>

1 0

r1166 - in trunk: . mavenpom4labs mavenpom4redmine mavenpom4redmine/mavenpom4redmineAndCentral mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt mavenpom4redmine/src/site/apt src/site/apt
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 17:34:12 +0200 (Fri, 09 Sep 2011) New Revision: 1166 Url: http://nuiton.org/repositories/revision/mavenpom/1166 Log: Anomalie #1733: Can't deploy multi locale site Evolution #1735: Deploy snapshot and release with http protocol and nuiton nexus update documentation clean obsolete stuffs Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt trunk/mavenpom4redmine/pom.xml trunk/mavenpom4redmine/src/site/apt/minimalpom.apt trunk/pom.xml trunk/src/site/apt/index.apt trunk/src/site/apt/properties.apt.vm Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2011-09-09 14:25:40 UTC (rev 1165) +++ trunk/mavenpom4labs/pom.xml 2011-09-09 15:34:12 UTC (rev 1166) @@ -147,7 +147,7 @@    - +  <profiles> @@ -162,17 +162,12 @@ </activation> <properties> + <platform>nuiton.org</platform>  <license.licenseName>lgpl_v3</license.licenseName> -  - <site.server>nuiton.org</site.server> - -  - <site.repository>${our.site.repository}/mavenpom</site.repository> -  <scmwebeditorEnabled>true</scmwebeditorEnabled> <payPalEnabled>true</payPalEnabled> @@ -181,12 +176,12 @@ <googleAnalyticsEnabled>true</googleAnalyticsEnabled> </properties> -  + </distributionManagement> </profile>  Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 14:25:40 UTC (rev 1165) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 15:34:12 UTC (rev 1166) @@ -65,9 +65,6 @@ <properties> -  -  -  <release.repository>${central.release.repository}</release.repository> @@ -88,38 +85,10 @@   -  -  -  -  -  -  -  -  -  -  -  -  <profiles> <profile> - <id>internal</id> - <activation> - <property> - <name>internal</name> - <value>true</value> - </property> - </activation> - <properties> -  -  - </properties> - </profile> - - <profile> <id>central-safe</id> <activation> <property> Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt 2011-09-09 14:25:40 UTC (rev 1165) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt 2011-09-09 15:34:12 UTC (rev 1166) @@ -108,6 +108,13 @@ <siteSourcesType>rst</siteSourcesType> </properties> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + <build> <plugins> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2011-09-09 14:25:40 UTC (rev 1165) +++ trunk/mavenpom4redmine/pom.xml 2011-09-09 15:34:12 UTC (rev 1166) @@ -155,11 +155,6 @@ target/${project.artifactId}-${project.version}-full.zip </redmine.libReleaseFiles> -  - -  -  - </properties> <packaging>pom</packaging> @@ -168,19 +163,6 @@   -  -   <profiles> @@ -666,28 +648,6 @@ </build> </profile> - <profile> - <id>internal</id> - <activation> - <property> - <name>internal</name> - <value>true</value> - </property> - </activation> - <properties> -  -  - </properties> - -  - </profile> - - </profiles> </project> Modified: trunk/mavenpom4redmine/src/site/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4redmine/src/site/apt/minimalpom.apt 2011-09-09 14:25:40 UTC (rev 1165) +++ trunk/mavenpom4redmine/src/site/apt/minimalpom.apt 2011-09-09 15:34:12 UTC (rev 1166) @@ -108,6 +108,13 @@ <siteSourcesType>apt</siteSourcesType> </properties> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + <build> <plugins> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 14:25:40 UTC (rev 1165) +++ trunk/pom.xml 2011-09-09 15:34:12 UTC (rev 1166) @@ -183,13 +183,13 @@ <listId>${projectId}</listId>  - <central.release.repository>scpexe://nuiton.org/var/lib/nexus/storage/central-releases</central.release.repository> + <central.release.repository>http://nexus.nuiton.org/nexus/content/repositories/central-releases</central.release.repository>  - <other.release.repository>scpexe://nuiton.org/var/lib/nexus/storage/other-releases</other.release.repository> + <other.release.repository>http://nexus.nuiton.org/nexus/content/repositories/other-releases</other.release.repository>  - <our.snapshot.repository>scpexe://nuiton.org/var/lib/nexus/storage/snapshots</our.snapshot.repository> + <our.snapshot.repository>http://nexus.nuiton.org/nexus/content/repositories/snapshots</our.snapshot.repository>  <our.site.repository>scpexe://${platform}/var/lib/redmine-${platform}/project-site</our.site.repository> @@ -198,20 +198,14 @@ <release.repository>${other.release.repository}</release.repository>  - <release.server>nuiton.org</release.server> + <release.server>nuiton-nexus-deploy</release.server>  <snapshot.repository>${our.snapshot.repository}</snapshot.repository>  - <snapshot.server>nuiton.org</snapshot.server> + <snapshot.server>nuiton-nexus-deploy</snapshot.server> -  - <site.repository>${our.site.repository}</site.repository> - -  - <site.server>${platform}</site.server> -  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -1511,8 +1505,6 @@ <release.repository>${central.release.repository}</release.repository>  <repository.home.url>${central.release.home.url}</repository.home.url> -  - <site.repository>${our.site.repository}/${projectId}</site.repository>  <redmine.safe>true</redmine.safe> @@ -1534,8 +1526,8 @@ <distributionManagement> <site> - <id>${site.server}</id> - <url>${site.repository}</url> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement> <build> Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2011-09-09 14:25:40 UTC (rev 1165) +++ trunk/src/site/apt/index.apt 2011-09-09 15:34:12 UTC (rev 1166) @@ -36,6 +36,45 @@ projets {{{http://www.codelutin.com}code Lutin}}. +* Nouveautés de la version 3.0.3 + +** Correction des déployements de site + + La version 3.0.3 corrige les problèmes suite au passage sur le + maven-site-plugin 3.0. + + L'héritage des définitions de site ne fonctionne plus, on ne peut donc plus + gérer cela au niveau de mavenpom et ses fils. + + Il faut donc dans chaque projet client ajouter ceci : + +-------------------------------------------------------------------------------- + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> +-------------------------------------------------------------------------------- + + Les variables *site.repository* et *site.server* ne sont donc plus utiliséees et + sont supprimées sauf pour les projets héritants du mavenpom4labs. + +** Déployements via nexus (plutôt que par ssh) + + On utilise désormais le déployement en http via nexus. + + Il faut donc avoir un nouveau server dans son settings.xml + +-------------------------------------------------------------------------------- +  + <server> + <id>nuiton-nexus-deploy</id> + <username>deployment</username> + <password>{le mot de passe qui va bien :)}</password> + </server> +-------------------------------------------------------------------------------- + * Nouveautés de la version 3.0 La version 3.0 survient avec une nouvelle forge http://forge.codelutin.com Modified: trunk/src/site/apt/properties.apt.vm =================================================================== --- trunk/src/site/apt/properties.apt.vm 2011-09-09 14:25:40 UTC (rev 1165) +++ trunk/src/site/apt/properties.apt.vm 2011-09-09 15:34:12 UTC (rev 1166) @@ -270,9 +270,9 @@ *--------------------------------------+--------------------------------------------------------+ | {{maven.javadoc.quiet}} | <<true>> | *--------------------------------------+--------------------------------------------------------+ -| {{sonar.host.url}} | <<http://sonar.${platform}/sonar>> | +| {{sonar.host.url}} | <<http://sonar.(platform)/sonar>> | *--------------------------------------+--------------------------------------------------------+ -| {{jenkins.host.url}} | <<http://jenkins.${platform}/jenkins>> | +| {{jenkins.host.url}} | <<http://jenkins.(platform)/jenkins>> | *--------------------------------------+--------------------------------------------------------+ * Propriétés pour les déployements @@ -282,24 +282,20 @@ *--------------------------------------+--------------------------------------------------------+ | {{snapshot.repository}} | <<(our.snapshot.repository)>> | *--------------------------------------+--------------------------------------------------------+ -| {{snapshot.server}} | <<nuiton.org>> | +| {{snapshot.server}} | <<nuiton-nexus-deploy>> | *--------------------------------------+--------------------------------------------------------+ -| {{our.snapshot.repository}} | <<scpexe://nuiton.org/var/lib/nexus/storage/snapshots>>| +| {{our.snapshot.repository}} | <<http://nexus.nuiton.org/nexus/content/repositories/snapshots>>| *--------------------------------------+--------------------------------------------------------+ | {{release.repository}} | <<(other.release.repository)>> | *--------------------------------------+--------------------------------------------------------+ -| {{release.server}} | <<nuiton.org>> | +| {{release.server}} | <<nuiton-nexus-deploy>> | *--------------------------------------+--------------------------------------------------------+ -| {{other.release.repository}} | <<scpexe://nuiton.org/var/lib/nexus/storage/other-releases>> | +| {{other.release.repository}} | <<http://nexus.nuiton.org/nexus/content/repositories/others-releases>> | *--------------------------------------+--------------------------------------------------------+ -| {{central.release.repository}}| <<scpexe://nuiton.org/var/lib/nexus/storage/central-releases>>| +| {{central.release.repository}}| <<http://nexus.nuiton.org/nexus/content/repositories/central-releases>>| *--------------------------------------+--------------------------------------------------------+ -| {{site.repository}} | <<(our.site.repository)>> | +| {{our.site.repository}} | <<scpexe://(platform)/var/lib/redmine-(platform)/project-site/(projectId)>> | *--------------------------------------+--------------------------------------------------------+ -| {{site.server}} | <<nuiton.org>> | -*--------------------------------------+--------------------------------------------------------+ -| {{our.site.repository}} | <<scpexe://nuiton.org/var/lib/redmine-${platform}/project-site/${projectId}>> | -*--------------------------------------+--------------------------------------------------------+ Détails @@ -542,7 +538,7 @@ ** {snapshot.server} - Id du serveur à utiliser pour déployer les snapshots, par défault : <<nuiton>>.\ + Id du serveur à utiliser pour déployer les snapshots, par défault : <<nuiton-nexus-deploy>>.\ <<Note:>> le serveur doit être défini dans le <<settings.xml>>.\ {{{Propriétés pour les déployements}[remonter]}} @@ -565,7 +561,7 @@ ** {release.server} - Id du serveur à utiliser pour déployer les releases, par défaut : <<nuiton>>. + Id du serveur à utiliser pour déployer les releases, par défaut : <<nuiton-nexus-deploy>>. <<Note:>> le serveur doit être défini dans le <<settings.xml>>.\ {{{Propriétés pour les déployements}[remonter]}} @@ -592,18 +588,6 @@ -------------------------------------------------------------------------------- {{{Propriétés pour les déployements}[remonter]}} -** {site.repository} - - Url du dépôt maven où deployer les sites, par défaut <<(our.site.repository)>>.\ - {{{Propriétés pour les déployements}[remonter]}} - -** {site.server} - - Id du serveur à utiliser pour déployer les sites, par défaut : <<nuiton>>. - - <<Note:>> le serveur doit être défini dans le <<settings.xml>>.\ - {{{Propriétés pour les déployements}[remonter]}} - ** {our.site.repository} Url du dépôt maven de Nuiton où deployer les sites.

1 0

r1165 - in trunk: mavenpom4labs mavenpom4labs/src/site mavenpom4redmine mavenpom4redmine/mavenpom4redmineAndCentral mavenpom4redmine/mavenpom4redmineAndCentral/src/site mavenpom4redmine/src/site src/site
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 16:25:40 +0200 (Fri, 09 Sep 2011) New Revision: 1165 Url: http://nuiton.org/repositories/revision/mavenpom/1165 Log: Anomalie #1733: Can't deploy multi locale site + fix (but still not working everywhere...) breadcrumbs Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4labs/src/site/site_en.xml trunk/mavenpom4labs/src/site/site_fr.xml trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml trunk/mavenpom4redmine/pom.xml trunk/mavenpom4redmine/src/site/site_en.xml trunk/mavenpom4redmine/src/site/site_fr.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2011-09-09 10:59:56 UTC (rev 1164) +++ trunk/mavenpom4labs/pom.xml 2011-09-09 14:25:40 UTC (rev 1165) @@ -184,7 +184,7 @@  </profile> Modified: trunk/mavenpom4labs/src/site/site_en.xml =================================================================== --- trunk/mavenpom4labs/src/site/site_en.xml 2011-09-09 10:59:56 UTC (rev 1164) +++ trunk/mavenpom4labs/src/site/site_en.xml 2011-09-09 14:25:40 UTC (rev 1165) @@ -32,8 +32,7 @@ <body> <breadcrumbs> - <item name="${project.name}" - href="http://maven-site.nuiton.org/mavenpom/mavenpom4labs/index.html"/> + <item name="${project.name}" href="${project.url}"/> </breadcrumbs>  Modified: trunk/mavenpom4labs/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4labs/src/site/site_fr.xml 2011-09-09 10:59:56 UTC (rev 1164) +++ trunk/mavenpom4labs/src/site/site_fr.xml 2011-09-09 14:25:40 UTC (rev 1165) @@ -32,8 +32,7 @@ <body> <breadcrumbs> - <item name="${project.name}" - href="http://maven-site.nuiton.org/mavenpom/mavenpom4labs/index.html"/> + <item name="${project.name}" href="${project.url}"/> </breadcrumbs> <menu ref="parent"/> Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 10:59:56 UTC (rev 1164) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 14:25:40 UTC (rev 1165) @@ -113,9 +113,9 @@ </activation> <properties>  - <site.repository> +  </properties> </profile> Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml 2011-09-09 10:59:56 UTC (rev 1164) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml 2011-09-09 14:25:40 UTC (rev 1165) @@ -34,14 +34,13 @@ <body> <breadcrumbs> - <item name="${project.name}" - href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/mavenpom4redmineAndC…"/> + <item name="${project.name}" href="${project.url}"/> </breadcrumbs>   <menu name="Parent Projet"> - <item name="Mavenpom" href="../../en/index.html"/> + <item name="Mavenpom4redmine" href="../../en/index.html"/> </menu> <menu name="Language"> Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml 2011-09-09 10:59:56 UTC (rev 1164) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml 2011-09-09 14:25:40 UTC (rev 1165) @@ -33,8 +33,7 @@ <body> <breadcrumbs> - <item name="${project.name}" - href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/mavenpom4redmineAndC…"/> + <item name="${project.name}" href="${project.url}"/> </breadcrumbs> <menu ref="parent"/> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2011-09-09 10:59:56 UTC (rev 1164) +++ trunk/mavenpom4redmine/pom.xml 2011-09-09 14:25:40 UTC (rev 1165) @@ -23,7 +23,9 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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> @@ -77,7 +79,7 @@    - <mailingLists> +    @@ -134,8 +136,10 @@ <redmine.url>http://${platform}</redmine.url> <redmine.projectId>${projectId}</redmine.projectId> <redmine.xmlPath>${maven.gen.dir}/changes/changes.xml</redmine.xmlPath> - <redmine.collectedArtifacts>target/collect-artifacts.txt</redmine.collectedArtifacts> - <redmine.collectedAttachments>target/collect-attachments.txt</redmine.collectedAttachments> + <redmine.collectedArtifacts>target/collect-artifacts.txt + </redmine.collectedArtifacts> + <redmine.collectedAttachments>target/collect-attachments.txt + </redmine.collectedAttachments> <redmine.deploymentUrl>${repository.home.url}</redmine.deploymentUrl> <redmine.templateDirectory> @@ -143,7 +147,7 @@ </redmine.templateDirectory>  - <redmine.releaseFiles /> + <redmine.releaseFiles/>  <redmine.libReleaseFiles> @@ -268,7 +272,8 @@ </goals> <phase>install</phase> <configuration> - <descriptionFile>${redmine.collectedArtifacts}</descriptionFile> + <descriptionFile>${redmine.collectedArtifacts} + </descriptionFile> <includeAttached>true</includeAttached> <includeSiteAttached>true</includeSiteAttached> </configuration> @@ -281,7 +286,8 @@ <phase>install</phase> <configuration> <extraFiles>${redmine.releaseFiles}</extraFiles> - <descriptionFile>${redmine.collectedAttachments}</descriptionFile> + <descriptionFile>${redmine.collectedAttachments} + </descriptionFile> <includeAttached>false</includeAttached> </configuration> </execution> @@ -382,9 +388,11 @@ <phase>validate</phase>  <configuration> - <filesFromProperties>${redmine.collectedAttachments}</filesFromProperties> + <filesFromProperties>${redmine.collectedAttachments} + </filesFromProperties> - <urlDownload>${redmine.url}/projects/files/${projectId}</urlDownload> + <urlDownload>${redmine.url}/projects/files/${projectId} + </urlDownload> <artifactsFile>${redmine.collectedArtifacts}</artifactsFile> </configuration> @@ -453,8 +461,12 @@  <runOnce>true</runOnce> - <emailTitle>[ANN] - ${project.name} ${project.version} released</emailTitle> - <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm</emailContentFile> + <emailTitle>[ANN] - ${project.name} ${project.version} + released + </emailTitle> + <emailContentFile> + target/generated-sources/announcement/release-email-announcement.vm + </emailContentFile> <mailSender> <name>${platform} Release Notification</name> <email>noreply@${platform}</email> @@ -499,7 +511,9 @@ <closeVersion>true</closeVersion>  - <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm</newsContentFile> + <newsContentFile> + target/generated-sources/announcement/release-news-announcement.vm + </newsContentFile> <newsSummary>${project.description}</newsSummary> <newsTitle>${project.name} ${project.version} released</newsTitle> @@ -664,6 +678,13 @@   </properties> + +  </profile> Modified: trunk/mavenpom4redmine/src/site/site_en.xml =================================================================== --- trunk/mavenpom4redmine/src/site/site_en.xml 2011-09-09 10:59:56 UTC (rev 1164) +++ trunk/mavenpom4redmine/src/site/site_en.xml 2011-09-09 14:25:40 UTC (rev 1165) @@ -33,10 +33,9 @@ <body> -  + <breadcrumbs> + <item name="${project.name}" href="${project.url}"/> + </breadcrumbs>   Modified: trunk/mavenpom4redmine/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4redmine/src/site/site_fr.xml 2011-09-09 10:59:56 UTC (rev 1164) +++ trunk/mavenpom4redmine/src/site/site_fr.xml 2011-09-09 14:25:40 UTC (rev 1165) @@ -32,10 +32,9 @@ <body> -  + <breadcrumbs> + <item name="${project.name}" href="${project.url}"/> + </breadcrumbs> <menu ref="parent"/> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2011-09-09 10:59:56 UTC (rev 1164) +++ trunk/src/site/site_en.xml 2011-09-09 14:25:40 UTC (rev 1165) @@ -44,6 +44,10 @@ </bannerRight> <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}"/> + </breadcrumbs> <links> <item name="Chorem" href="http://www.chorem.org"/> <item name="Nuiton" href="http://www.nuiton.org"/> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-09-09 10:59:56 UTC (rev 1164) +++ trunk/src/site/site_fr.xml 2011-09-09 14:25:40 UTC (rev 1165) @@ -44,6 +44,11 @@ </bannerRight> <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}"/> + </breadcrumbs> + <links> <item name="Chorem" href="http://www.chorem.org"/> <item name="Nuiton" href="http://www.nuiton.org"/>

1 0

r1164 - trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 12:59:56 +0200 (Fri, 09 Sep 2011) New Revision: 1164 Url: http://nuiton.org/repositories/revision/mavenpom/1164 Log: fix breadcrumbs Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml 2011-09-09 10:51:41 UTC (rev 1163) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml 2011-09-09 10:59:56 UTC (rev 1164) @@ -35,7 +35,7 @@ <breadcrumbs> <item name="${project.name}" - href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmineAndCentral/index.html"/> + href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/mavenpom4redmineAndC…"/> </breadcrumbs>  Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml 2011-09-09 10:51:41 UTC (rev 1163) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml 2011-09-09 10:59:56 UTC (rev 1164) @@ -34,7 +34,7 @@ <breadcrumbs> <item name="${project.name}" - href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmineAndCentral/index.html"/> + href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/mavenpom4redmineAndC…"/> </breadcrumbs> <menu ref="parent"/>

1 0

r1163 - trunk/mavenpom4redmine/mavenpom4redmineAndCentral
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 12:51:41 +0200 (Fri, 09 Sep 2011) New Revision: 1163 Url: http://nuiton.org/repositories/revision/mavenpom/1163 Log: Anomalie #1733: Can't deploy multi locale site Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 10:34:26 UTC (rev 1162) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 10:51:41 UTC (rev 1163) @@ -113,9 +113,9 @@ </activation> <properties>  -  + </site.repository> </properties> </profile>

1 0

r1162 - in trunk: mavenpom4labs mavenpom4redmine mavenpom4redmine/mavenpom4redmineAndCentral
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 12:34:26 +0200 (Fri, 09 Sep 2011) New Revision: 1162 Url: http://nuiton.org/repositories/revision/mavenpom/1162 Log: Anomalie #1733: Can't deploy multi locale site Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml trunk/mavenpom4redmine/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2011-09-09 10:34:00 UTC (rev 1161) +++ trunk/mavenpom4labs/pom.xml 2011-09-09 10:34:26 UTC (rev 1162) @@ -124,9 +124,6 @@  <platform>labs.libre-entreprise.org</platform> -  -  -  <sonar.host.url>http://sonar.nuiton.org/sonar</sonar.host.url> @@ -170,13 +167,11 @@  <license.licenseName>lgpl_v3</license.licenseName> -  -  -  <site.server>nuiton.org</site.server> -  - <site.repository>${our.site.repository}/mavenpom/mavenpom4labs</site.repository> + +  + <site.repository>${our.site.repository}/mavenpom</site.repository>  <scmwebeditorEnabled>true</scmwebeditorEnabled> @@ -186,12 +181,12 @@ <googleAnalyticsEnabled>true</googleAnalyticsEnabled> </properties> - <distributionManagement> +  </profile>  Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 10:34:00 UTC (rev 1161) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2011-09-09 10:34:26 UTC (rev 1162) @@ -66,7 +66,7 @@ <properties>  - <site.repository>${our.site.repository}</site.repository> +   <release.repository>${central.release.repository}</release.repository> @@ -89,16 +89,16 @@   - <distributionManagement> - <site> - <id>${site.server}</id> -  - <url>${site.repository}</url> - </site> - </distributionManagement> +  +  +  +  +  +  +  +  +  +   <profiles> @@ -113,9 +113,9 @@ </activation> <properties>  - <site.repository> +  </properties> </profile> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2011-09-09 10:34:00 UTC (rev 1161) +++ trunk/mavenpom4redmine/pom.xml 2011-09-09 10:34:26 UTC (rev 1162) @@ -128,7 +128,7 @@ <publicProject>true</publicProject> <license.licenseName>lgpl_v3</license.licenseName> - +  <redmine.safe>false</redmine.safe> <redmine.url>http://${platform}</redmine.url> @@ -141,7 +141,7 @@ <redmine.templateDirectory> http://maven-site.nuiton.org/mavenpom/announcement/redmine </redmine.templateDirectory> - +  <redmine.releaseFiles /> @@ -154,7 +154,7 @@   - <site.repository>${our.site.repository}</site.repository> +  </properties> @@ -165,46 +165,21 @@   +  - <url>${site.repository}</url> + <url>${site.repository}/${projectId}</url> </site> </distributionManagement> - + -->  <profiles> -  -  -  -  -  -  -  -  -  - -  -  -  -  -  -  -  -  -  -  -  -  -  - -  -  <profile> <id>redmine-build-release-profile</id> @@ -619,7 +594,7 @@ <value>true</value> </property> </activation> - + <build> <defaultGoal>validate</defaultGoal> @@ -676,7 +651,7 @@ </build> </profile> - + <profile> <id>internal</id> <activation> @@ -687,7 +662,7 @@ </activation> <properties>  - <site.repository>${our.site.repository}/mavenpom/mavenpom4redmine</site.repository> +  </properties> </profile>

1 0

r1161 - trunk
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 12:34:00 +0200 (Fri, 09 Sep 2011) New Revision: 1161 Url: http://nuiton.org/repositories/revision/mavenpom/1161 Log: T?\195?\162che #1693: Updates to maven-nuiton-skin 1.1.1 Anomalie #1733: Can't deploy multi locale site (begin of it) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-28 10:21:52 UTC (rev 1160) +++ trunk/pom.xml 2011-09-09 10:34:00 UTC (rev 1161) @@ -192,7 +192,7 @@ <our.snapshot.repository>scpexe://nuiton.org/var/lib/nexus/storage/snapshots</our.snapshot.repository>  - <our.site.repository>scpexe://nuiton.org/var/lib/redmine-${platform}/project-site</our.site.repository> + <our.site.repository>scpexe://${platform}/var/lib/redmine-${platform}/project-site</our.site.repository>  <release.repository>${other.release.repository}</release.repository> @@ -238,7 +238,7 @@ <helperPluginVersion>1.3</helperPluginVersion> <jredminePluginVersion>1.2.2</jredminePluginVersion> <jrstPluginVersion>1.4</jrstPluginVersion> - <nuitonSkinVersion>1.1.1-SNAPSHOT</nuitonSkinVersion> + <nuitonSkinVersion>1.1.1</nuitonSkinVersion> <webstartPluginVersion>1.0-alpha-2-cl_20100511</webstartPluginVersion>

1 0