Author: tchemit Date: 2012-06-01 12:04:08 +0200 (Fri, 01 Jun 2012) New Revision: 3410 Url: http://chorem.org/repositories/revision/pollen/3410 Log: updates to nuiton-utils 2.4.9 + use aggregate application config report Modified: trunk/pollen-ui-struts2/pom.xml trunk/pom.xml trunk/src/site/rst/configure.rst Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-01 10:03:18 UTC (rev 3409) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-01 10:04:08 UTC (rev 3410) @@ -197,7 +197,7 @@ <properties> <i18n.silent>true</i18n.silent> - <i18n.bundleOutputName>pollen-i18n</i18n.bundleOutputName> + <i18n.bundleOutputName>${pollenI18nBundle}</i18n.bundleOutputName> <redmine.releaseFiles> target/${project.build.finalName}.war, @@ -440,36 +440,6 @@ </build> </profile> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils-maven-report-plugin</artifactId> - <version>${nuitonUtilsVersion}</version> - <reportSets> - <reportSet> - <reports> - <report>application-config-report</report> - </reports> - </reportSet> - </reportSets> - <configuration> - <i18nBundleName>${i18n.bundleOutputName}</i18nBundleName> - </configuration> - </plugin> - </plugins> - </reporting> - </profile> - </profiles> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-01 10:03:18 UTC (rev 3409) +++ trunk/pom.xml 2012-06-01 10:04:08 UTC (rev 3410) @@ -1,5 +1,7 @@ <?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> @@ -181,7 +183,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> - <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.9-SNAPSHOT</nuitonUtilsVersion> <h2Version>1.3.167</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4</struts2Version> @@ -190,6 +192,7 @@ <slf4jVersion>1.6.4</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> + <pollenI18nBundle>pollen-i18n</pollenI18nBundle> <!-- license to use --> <license.licenseName>agpl_v3</license.licenseName> @@ -601,14 +604,18 @@ </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>l10n-maven-plugin</artifactId> - <version>${l10nPluginVersion}</version> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils-maven-report-plugin</artifactId> + <version>${nuitonUtilsVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>aggregate-application-config-report</report> + </reports> + </reportSet> + </reportSets> <configuration> - <locales> - <locale>fr_FR</locale> - <locale>en_GB</locale> - </locales> + <i18nBundleName>${pollenI18nBundle}</i18nBundleName> </configuration> </plugin> Modified: trunk/src/site/rst/configure.rst =================================================================== --- trunk/src/site/rst/configure.rst 2012-06-01 10:03:18 UTC (rev 3409) +++ trunk/src/site/rst/configure.rst 2012-06-01 10:04:08 UTC (rev 3410) @@ -96,4 +96,4 @@ | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _options page: ./pollen-ui-struts2/application-config-report.html \ No newline at end of file +.. _options page: ./application-config-report.html \ No newline at end of file