Author: tchemit Date: 2012-06-10 22:39:26 +0200 (Sun, 10 Jun 2012) New Revision: 3430 Url: http://chorem.org/repositories/revision/pollen/3430 Log: reuse old site configuration + update slf4j version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-10 20:38:36 UTC (rev 3429) +++ trunk/pom.xml 2012-06-10 20:39:26 UTC (rev 3430) @@ -189,7 +189,7 @@ <struts2Version>2.3.4</struts2Version> <jqueryPluginVersion>3.3.1</jqueryPluginVersion> <shiroVersion>1.2.0</shiroVersion> - <slf4jVersion>1.6.4</slf4jVersion> + <slf4jVersion>1.6.5</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> @@ -434,6 +434,17 @@ <artifactId>doxia-module-jrst</artifactId> <version>${jrstPluginVersion}</version> </dependency> + <!-- dependencies needed by application config report --> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + </dependency> </dependencies> </plugin> @@ -589,62 +600,45 @@ </property> </activation> - <build> + <reporting> <plugins> <plugin> - <artifactId>maven-site-plugin</artifactId> - <inherited>false</inherited> + <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> - <reportPlugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils-maven-report-plugin</artifactId> - <reports> - <report>aggregate-application-config-report</report> - </reports> - <!--reportSets> - <reportSet> - <reports> - <report>aggregate-application-config-report</report> - </reports> - </reportSet> - </reportSets--> - <configuration> - <i18nBundleName>${pollenI18nBundle}</i18nBundleName> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - </reports> - </plugin> - </reportPlugins> + <i18nBundleName>${pollenI18nBundle}</i18nBundleName> </configuration> - <!-- dependencies needed by application config report --> - <dependencies> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2Version}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernateVersion}</version> - </dependency> - </dependencies> </plugin> + + <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>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> </plugins> - </build> + </reporting> </profile>