Author: tchemit Date: 2012-05-02 11:46:09 +0200 (Wed, 02 May 2012) New Revision: 2338 Url: http://nuiton.org/repositories/revision/nuiton-utils/2338 Log: use mavenpom 3.3.1 + i18n Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report_fr.properties trunk/pom.xml Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-05-01 15:34:45 UTC (rev 2337) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-05-02 09:46:09 UTC (rev 2338) @@ -154,7 +154,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>l10n-maven-plugin</artifactId> - <version>1.0-alpha-2</version> <configuration> <locales> <locale>fr</locale> @@ -200,7 +199,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>l10n-maven-plugin</artifactId> - <version>1.0-alpha-2</version> + <version>${l10nPluginVersion}</version> <configuration> <locales> <locale>fr</locale> Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java 2012-05-01 15:34:45 UTC (rev 2337) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java 2012-05-02 09:46:09 UTC (rev 2338) @@ -283,7 +283,7 @@ sinkCellVerbatimText(option.getDefaultValue()); if (!optionWithDetail) { sinkCellText(getText(option.isFinal())); - sinkCellText(getText(option.isTransient())); + sinkCellText(getText(!option.isTransient())); } sink.tableRow_(); } Modified: trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report_fr.properties =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report_fr.properties 2012-05-01 15:34:45 UTC (rev 2337) +++ trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report_fr.properties 2012-05-02 09:46:09 UTC (rev 2338) @@ -32,7 +32,7 @@ report.config.option.type=Type report.config.option.defaultValue=Valeur par d\u00E9faut report.config.option.final=Option modifiable -report.config.option.transient=Option non sauvegardable +report.config.option.transient=Option sauvegardable report.config.name=Nom de la configuration report.config.description=Description report.config.nbOptions=Nombre d'options Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-01 15:34:45 UTC (rev 2337) +++ trunk/pom.xml 2012-05-02 09:46:09 UTC (rev 2338) @@ -24,14 +24,10 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <artifactId>nuiton-utils-parent</artifactId> @@ -45,6 +41,104 @@ <module>nuiton-utils-maven-report-plugin</module> </modules> + <name>Nuiton Utils</name> + <description>Parent of nuiton utils projects.</description> + <inceptionYear>2011</inceptionYear> + <url>http://maven-site.nuiton.org/nuiton-utils</url> + + <developers> + + <developer> + <name>Brendan Le Ny</name> + <id>bleny</id> + <email>bleny@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Benjamin Poussin</name> + <id>bpoussin</id> + <email>poussin@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>developer</role> + <role>Debian packager</role> + </roles> + </developer> + + <developer> + <name>Éric Chatellier</name> + <id>echatellier</id> + <email>chatellier@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Florian Desbois</name> + <id>fdesbois</id> + <email>desbois@codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Sylvain Letellier</name> + <id>sletellier</id> + <email>letellier@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@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + </developers> + + <packaging>pom</packaging> + + <properties> + + <projectId>nuiton-utils</projectId> + + <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <aspectjVersion>1.6.12</aspectjVersion> + <xworkVersion>2.3.1.2</xworkVersion> + <doxiaVersion>1.3</doxiaVersion> + + <!-- i18n configuration --> + <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> + + </properties> + <dependencyManagement> <dependencies> @@ -130,14 +224,12 @@ <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-api</artifactId> <version>2.2.1</version> - <!--<scope>provided</scope>--> </dependency> <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-impl</artifactId> <version>2.2</version> - <!--<scope>provided</scope>--> </dependency> <dependency> @@ -208,106 +300,6 @@ </dependencies> </dependencyManagement> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>Nuiton Utils</name> - <description>Parent of nuiton utils projects.</description> - <inceptionYear>2011</inceptionYear> - <url>http://maven-site.nuiton.org/nuiton-utils</url> - - <developers> - - <developer> - <name>Brendan Le Ny</name> - <id>bleny</id> - <email>bleny@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>developer</role> - </roles> - </developer> - - <developer> - <name>Benjamin Poussin</name> - <id>bpoussin</id> - <email>poussin@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>developer</role> - <role>Debian packager</role> - </roles> - </developer> - - <developer> - <name>Éric Chatellier</name> - <id>echatellier</id> - <email>chatellier@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>developer</role> - </roles> - </developer> - - <developer> - <name>Florian Desbois</name> - <id>fdesbois</id> - <email>desbois@codelutin.com</email> - <organization>Code Lutin</organization> - <timezone>+2</timezone> - <roles> - <role>developer</role> - </roles> - </developer> - - <developer> - <name>Sylvain Letellier</name> - <id>sletellier</id> - <email>letellier@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@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>developer</role> - </roles> - </developer> - - </developers> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>pom</packaging> - - <properties> - - <projectId>nuiton-utils</projectId> - - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <aspectjVersion>1.6.12</aspectjVersion> - <xworkVersion>2.3.1.2</xworkVersion> - <doxiaVersion>1.3</doxiaVersion> - - <!-- i18n configuration --> - <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> - - </properties> - <build> <pluginManagement> <plugins> @@ -322,11 +314,7 @@ </plugins> </pluginManagement> </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <!-- Source control management. --> <scm> <connection> scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk @@ -344,4 +332,48 @@ </site> </distributionManagement> + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + </plugins> + </reporting> + + </profile> + + </profiles> + </project>