- Maven-nuiton-skin-commits - mailman.cloud.codelutin.com

r607 - trunk
by tchemit＠users.nuiton.org July 1, 2010

July 1, 2010

Author: tchemit Date: 2010-07-01 14:31:10 +0200 (Thu, 01 Jul 2010) New Revision: 607 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/607 Log: Utilisation de mavenpom4redmine 2.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-27 06:35:45 UTC (rev 606) +++ trunk/pom.xml 2010-07-01 12:31:10 UTC (rev 607) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.1</version> + <version>2.2.2</version> </parent> <artifactId>maven-nuiton-skin</artifactId>

1 0

r606 - trunk
by tchemit＠users.nuiton.org June 27, 2010

June 27, 2010

Author: tchemit Date: 2010-06-27 08:35:45 +0200 (Sun, 27 Jun 2010) New Revision: 606 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/606 Log: Utilisation de mavenpom4redmine 2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-19 18:56:20 UTC (rev 605) +++ trunk/pom.xml 2010-06-27 06:35:45 UTC (rev 606) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2</version> + <version>2.2.1</version> </parent> <artifactId>maven-nuiton-skin</artifactId>

1 0

r605 - trunk
by tchemit＠users.nuiton.org June 19, 2010

June 19, 2010

Author: tchemit Date: 2010-06-19 20:56:20 +0200 (Sat, 19 Jun 2010) New Revision: 605 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/605 Log: Utilisation de mavenpom4redmine 2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-19 01:04:32 UTC (rev 604) +++ trunk/pom.xml 2010-06-19 18:56:20 UTC (rev 605) @@ -1,14 +1,12 @@ <?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> <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <artifactId>maven-nuiton-skin</artifactId> @@ -73,9 +71,6 @@ <properties> -  - <release.repository>${nuiton.central.release.repository}</release.repository> - <locales>fr,en</locales> <siteSourcesType>apt</siteSourcesType> @@ -87,4 +82,52 @@ <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> </scm> + <profiles> + + <profile> + <id>central-safe</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <properties> + +  + <release.repository>${nuiton.central.release.repository}</release.repository> + + </properties> + + <build> + <defaultGoal>validate</defaultGoal> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-auto-container</goal> + </goals> + <configuration> + <addMavenCentral>true</addMavenCentral> + <failIfNotSafe>true</failIfNotSafe> + <repositories> + <nuiton-central-releases> + http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases + </nuiton-central-releases> + </repositories> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + </profiles> </project>

1 0

r604 - trunk
by tchemit＠users.nuiton.org June 19, 2010

June 19, 2010

Author: tchemit Date: 2010-06-19 03:04:32 +0200 (Sat, 19 Jun 2010) New Revision: 604 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/604 Log: use mavenpom 2.2 and central-safe server + reformat pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-02 10:28:32 UTC (rev 603) +++ trunk/pom.xml 2010-06-19 01:04:32 UTC (rev 604) @@ -1,86 +1,90 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.1.5</version> - </parent> - - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.5-SNAPSHOT</version> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.2-SNAPSHOT</version> + </parent> - <name>Maven Nuiton Skin</name> + <artifactId>maven-nuiton-skin</artifactId> + <version>1.0.5-SNAPSHOT</version> - <description>Theme Nuiton pour les sites maven.</description> - <inceptionYear>2006</inceptionYear> - <url>http://maven-site.nuiton.org/maven-nuiton-skin</url> + <name>Maven Nuiton Skin</name> - <developers> + <description>Theme Nuiton pour les sites maven.</description> + <inceptionYear>2006</inceptionYear> + <url>http://maven-site.nuiton.org/maven-nuiton-skin</url> - <developer> - <name>Julien Ruchaud</name> - <id>jruchaud</id> - <email>ruchaud(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Developer</role> - </roles> - </developer> + <developers> - <developer> - <name>Eric Chatellier</name> - <id>echatellier</id> - <email>chatellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Developer</role> - </roles> - </developer> + <developer> + <name>Julien Ruchaud</name> + <id>jruchaud</id> + <email>ruchaud(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Developer</role> - </roles> - </developer> + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> - <developer> - <name>Geoffroy Lorieux</name> - <id>glorieux</id> - <email>glorieux(a)codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> - <roles> - <role>Developer</role> - </roles> - </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> - </developers> + <developer> + <name>Geoffroy Lorieux</name> + <id>glorieux</id> + <email>glorieux(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> - <packaging>jar</packaging> + </developers> - <properties> -  - <siteLocales>fr,en</siteLocales> - <locales>fr,en</locales> - <siteSourcesType>apt</siteSourcesType> - - </properties> + <packaging>jar</packaging> - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> - </scm> + <properties> +  + <release.repository>${nuiton.central.release.repository}</release.repository> + + <locales>fr,en</locales> + <siteSourcesType>apt</siteSourcesType> + + </properties> + + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> + </scm> + </project>

1 0

r603 - trunk
by tchemit＠users.nuiton.org June 2, 2010

June 2, 2010

Author: tchemit Date: 2010-06-02 12:28:32 +0200 (Wed, 02 Jun 2010) New Revision: 603 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/603 Log: Utilisation de mavenpom4redmine 2.1.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-01 02:06:28 UTC (rev 602) +++ trunk/pom.xml 2010-06-02 10:28:32 UTC (rev 603) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.4</version> + <version>2.1.5</version> </parent> <artifactId>maven-nuiton-skin</artifactId>

1 0

r602 - trunk
by tchemit＠users.nuiton.org June 1, 2010

June 1, 2010

Author: tchemit Date: 2010-06-01 04:06:28 +0200 (Tue, 01 Jun 2010) New Revision: 602 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/602 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-01 02:06:27 UTC (rev 601) +++ trunk/pom.xml 2010-06-01 02:06:28 UTC (rev 602) @@ -10,7 +10,7 @@ </parent> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.4</version> + <version>1.0.5-SNAPSHOT</version> <name>Maven Nuiton Skin</name> @@ -78,9 +78,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-…</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-…</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/tags/maven-nuit…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> </scm> </project>

1 0

r601 - in tags: . maven-nuiton-skin-1.0.4
by tchemit＠users.nuiton.org June 1, 2010

June 1, 2010

Author: tchemit Date: 2010-06-01 04:06:27 +0200 (Tue, 01 Jun 2010) New Revision: 601 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/601 Log: [maven-release-plugin] copy for tag maven-nuiton-skin-1.0.4 Added: tags/maven-nuiton-skin-1.0.4/ Property changes on: tags/maven-nuiton-skin-1.0.4 ___________________________________________________________________ Added: svn:ignore + .classpath .project target THIRD-PARTY.txt nbactions.xml .settings bin *.iml Added: svn:mergeinfo +

1 0

r600 - trunk
by tchemit＠users.nuiton.org June 1, 2010

June 1, 2010

Author: tchemit Date: 2010-06-01 04:06:25 +0200 (Tue, 01 Jun 2010) New Revision: 600 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/600 Log: [maven-release-plugin] prepare release maven-nuiton-skin-1.0.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-01 02:05:13 UTC (rev 599) +++ trunk/pom.xml 2010-06-01 02:06:25 UTC (rev 600) @@ -10,7 +10,7 @@ </parent> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4</version> <name>Maven Nuiton Skin</name> @@ -78,9 +78,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-…</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-…</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/tags/maven-nuit…</url> </scm> </project>

1 0

r599 - in trunk: . src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org June 1, 2010

June 1, 2010

Author: tchemit Date: 2010-06-01 04:05:13 +0200 (Tue, 01 Jun 2010) New Revision: 599 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/599 Log: update doc + changelog for release Modified: trunk/changelog.txt trunk/pom.xml trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-05-21 08:26:45 UTC (rev 598) +++ trunk/changelog.txt 2010-06-01 02:05:13 UTC (rev 599) @@ -1,3 +1,10 @@ +maven-nuiton-skin (1.0.4) unstable; urgency=low + + * Evolution #629: Use maven site variable 'locales' instead of our 'siteLocales' + * Evolution #652: Use mavenpom4remind 2.1.4 + + -- chemit(a)codelutin.com -- Tue, 01 Jun 2010 03:44:41 +0200 + maven-lutin-skin (0.2.3) unstable; urgency=low * Add icon JAXX Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-21 08:26:45 UTC (rev 598) +++ trunk/pom.xml 2010-06-01 02:05:13 UTC (rev 599) @@ -70,8 +70,9 @@ <packaging>jar</packaging> <properties> - +  <siteLocales>fr,en</siteLocales> + <locales>fr,en</locales> <siteSourcesType>apt</siteSourcesType> </properties> Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-05-21 08:26:45 UTC (rev 598) +++ trunk/src/site/apt/index.apt 2010-06-01 02:05:13 UTC (rev 599) @@ -39,7 +39,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.3</version> + <version>1.0.4</version> </skin> ------------------------------------------------------------------- Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2010-05-21 08:26:45 UTC (rev 598) +++ trunk/src/site/en/apt/index.apt 2010-06-01 02:05:13 UTC (rev 599) @@ -39,7 +39,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.3</version> + <version>1.0.4</version> </skin> -------------------------------------------------------------------

1 0

r598 - trunk/src/main/resources/META-INF/maven
by tchemit＠users.nuiton.org May 21, 2010

May 21, 2010

Author: tchemit Date: 2010-05-21 10:26:45 +0200 (Fri, 21 May 2010) New Revision: 598 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/598 Log: Evolution #629: Use maven site variable 'locales' instead of our 'siteLocales' Modified: trunk/src/main/resources/META-INF/maven/site.vm Modified: trunk/src/main/resources/META-INF/maven/site.vm =================================================================== --- trunk/src/main/resources/META-INF/maven/site.vm 2010-05-09 12:34:20 UTC (rev 597) +++ trunk/src/main/resources/META-INF/maven/site.vm 2010-05-21 08:26:45 UTC (rev 598) @@ -1,6 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -## set in gloabal variable firstLocale the first (says main) locale of site +## set in global variable firstLocale the first (says main) locale of site #macro ( computeDefaultLocale $locales ) #set ( $myindex = $locales.trim().indexOf(",") ) #if ( $myindex == -1 ) @@ -52,7 +52,7 @@ #end #macro ( links $links ) - #computeDefaultLocale( $siteLocales ) + #computeDefaultLocale( $locales ) #set ( $sitemapUrl = $PathTool.calculateLink( "./sitemap.html", $relativePath ) ) #set ( $sitemapUrl = $sitemapUrl.replaceAll( "\\", "/" ) ) #set ( $sitemapLabel = $i18n.getString( "maven-nuiton-skin", $locale, "goto.sitemap" ) ) @@ -71,7 +71,6 @@ ## | ##end #end - ## #computeDefaultLocale( $siteLocales ) #if ( "$scmwebeditorEnabled" != "false" ) | #link ( "$project.properties.scmwebeditorUrl?adresse=$project.scm.developerConnection&file_name=$alignedFileName&project_url=$project.url/$locale/$alignedFileName&lang=$locale&defaultLang=$firstLocale&format=$project.properties.siteSourcesType" , $i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.page" ) ) @@ -159,7 +158,7 @@ #macro ( mainMenu $menus ) #if ( "$scmwebeditorEnabled" != "false" ) - #computeDefaultLocale( $siteLocales ) + #computeDefaultLocale( $locales ) #set ($xmlExtention = ".xml") #link ( "$project.properties.scmwebeditorUrl?adresse=$project.scm.developerConnection&file_name=site_$locale$xmlExtention&project_url=$project.url/$locale/$alignedFileName&lang=$locale&defaultLang=$locale", $i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.menu" ) ) #end

1 0