September 2012 - Nuiton-utils-commits - mailman.cloud.codelutin.com

r2411 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org 04 Sep '12

04 Sep '12

Author: maven-release Date: 2012-09-04 14:46:48 +0200 (Tue, 04 Sep 2012) New Revision: 2411 Url: http://nuiton.org/repositories/revision/nuiton-utils/2411 Log: [maven-release-plugin] prepare release nuiton-utils-2.6.1 Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/pom.xml trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) +++ trunk/nuiton-csv/pom.xml 2012-09-04 12:46:48 UTC (rev 2411) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.1</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) +++ trunk/nuiton-profiling/pom.xml 2012-09-04 12:46:48 UTC (rev 2411) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.1</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) +++ trunk/nuiton-utils/pom.xml 2012-09-04 12:46:48 UTC (rev 2411) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.1</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-09-04 12:46:48 UTC (rev 2411) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.1</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) +++ trunk/nuiton-validator/pom.xml 2012-09-04 12:46:48 UTC (rev 2411) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.1</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) +++ trunk/pom.xml 2012-09-04 12:46:48 UTC (rev 2411) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.1</version> <modules> <module>nuiton-utils</module> @@ -327,12 +327,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.1 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.…</url> </scm> <distributionManagement>

1 0

r2410 - in trunk: . nuiton-csv nuiton-csv/src/site nuiton-profiling/src/site nuiton-utils nuiton-utils/src/site nuiton-utils-maven-report-plugin/src/site nuiton-validator nuiton-validator/src/site src/site
by tchemit＠users.nuiton.org 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 14:43:19 +0200 (Tue, 04 Sep 2012) New Revision: 2410 Url: http://nuiton.org/repositories/revision/nuiton-utils/2410 Log: fixes #2298: updates to nuiton-i18n 2.5 improve site (use fluido 1.3.0 + clean site descriptors) Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-csv/src/site/site_fr.xml trunk/nuiton-profiling/src/site/site_fr.xml trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml trunk/nuiton-utils/pom.xml trunk/nuiton-utils/src/site/site_fr.xml trunk/nuiton-validator/pom.xml trunk/nuiton-validator/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-csv/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -120,7 +120,7 @@  <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <configuration> <silent>true</silent> <bundles>fr_FR,en_GB,es_ES</bundles> Modified: trunk/nuiton-csv/src/site/site_fr.xml =================================================================== --- trunk/nuiton-csv/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-csv/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -35,8 +35,17 @@ <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> - <item name="${project.name}" href="http://maven-site.nuiton.org/nuiton-utils/nuiton-csv/index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <menu ref="modules"/> @@ -49,20 +58,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> </body> Modified: trunk/nuiton-profiling/src/site/site_fr.xml =================================================================== --- trunk/nuiton-profiling/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-profiling/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -33,6 +33,15 @@ <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="index.html"/> </breadcrumbs> @@ -59,20 +68,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> </body> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-utils/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -119,7 +119,7 @@  <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <configuration> <silent>true</silent> <bundles>fr_FR,en_GB,es_ES</bundles> Modified: trunk/nuiton-utils/src/site/site_fr.xml =================================================================== --- trunk/nuiton-utils/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-utils/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -33,6 +33,15 @@ <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="index.html"/> </breadcrumbs> @@ -60,20 +69,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> Modified: trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -29,9 +29,17 @@ <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> - <item name="${project.name}" - href="${project.url}/index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <menu ref="parent"/> @@ -46,20 +54,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> </body> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-validator/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -128,7 +128,7 @@  <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <configuration> <silent>true</silent> </configuration> Modified: trunk/nuiton-validator/src/site/site_fr.xml =================================================================== --- trunk/nuiton-validator/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-validator/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -29,13 +29,22 @@ <bannerLeft> <name>${project.name}</name> - <href>index.html</href> + <href>./index.html</href> </bannerLeft> <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <menu ref="parent"/> @@ -60,20 +69,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -129,7 +129,7 @@ <projectId>nuiton-utils</projectId> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <aspectjVersion>1.6.12</aspectjVersion> <xworkVersion>2.3.4</xworkVersion> <doxiaVersion>1.3</doxiaVersion> @@ -137,6 +137,9 @@  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> +  + <siteSourcesType>apt</siteSourcesType> + </properties> <dependencyManagement> @@ -314,7 +317,7 @@  <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin> @@ -365,6 +368,7 @@ <report>issue-tracking</report> <report>license</report> <report>scm</report> + <report>dependency-report</report> <report>dependencies</report> <report>dependency-convergence</report> <report>plugin-management</report> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -30,14 +30,14 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom> <fluidoSkin> - <topBarEnabled>true</topBarEnabled> + <topBarEnabled>false</topBarEnabled> <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> + <sideBarEnabled>true</sideBarEnabled> <searchEnabled>true</searchEnabled> <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> </fluidoSkin> @@ -57,20 +57,23 @@ <version position="right" /> <poweredBy> + <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> + img="http://maven-site.chorem.org/public/images/logos/maven-feather.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="images/logos/restructuredtext-logo.png"/> - - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="images/logos/jrst-logo.png"/> - </poweredBy> <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <links> <item name="Nuiton.org" href="http://nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com"/> @@ -92,20 +95,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> </body>

1 0

r2409 - in trunk: . nuiton-utils-maven-report-plugin nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report
by tchemit＠users.nuiton.org 02 Sep '12

02 Sep '12

Author: tchemit Date: 2012-09-02 18:36:14 +0200 (Sun, 02 Sep 2012) New Revision: 2409 Url: http://nuiton.org/repositories/revision/nuiton-utils/2409 Log: fixes #2294: Use m-plugin-p 3 new api (annotations) fixes #2295: Aggreagate application-config report should fork to compile modules Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AggregateApplicationConfigReport.java trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java trunk/pom.xml Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-08-30 14:43:50 UTC (rev 2408) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-09-02 16:36:14 UTC (rev 2409) @@ -71,6 +71,11 @@ </dependency> <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + </dependency> + + <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-api</artifactId> </dependency> @@ -146,6 +151,25 @@ <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + <goal>descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -164,10 +188,6 @@ </executions> </plugin> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - </plugin> - </plugins> </build> Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java 2012-08-30 14:43:50 UTC (rev 2408) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java 2012-09-02 16:36:14 UTC (rev 2409) @@ -24,6 +24,8 @@ package org.nuiton.util.plugin.report; import org.apache.maven.doxia.siterenderer.Renderer; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.AbstractMavenReport; import org.apache.maven.reporting.MavenReportException; @@ -58,10 +60,11 @@ * from the default build lifecycle. If the goal is run indirectly as part of a site generation, the output * directory configured in the Maven Site Plugin is used instead. * - * @parameter property="config.outputDirectory" default-value="${project.reporting.outputDirectory}" - * @required * @since 2.4.8 */ + @Parameter(property = "config.outputDirectory", + defaultValue = "${project.reporting.outputDirectory}", + required = true) private File outputDirectory; /** @@ -69,10 +72,11 @@ * from the default build lifecycle. If the goal is run indirectly as part of a site generation, the output * encoding configured in the Maven Site Plugin is used instead. * - * @parameter property="config.outputEncoding" default-value="${project.reporting.outputEncoding}" - * @required * @since 2.4.8 */ + @Parameter(property = "config.outputEncoding", + defaultValue = "${project.reporting.outputEncoding}", + required = true) private String outputEncoding; /** @@ -83,19 +87,20 @@ * could be costy if many dependencies), otherwise will init I18n system * usinga {@link DefaultI18nInitializer} with this bundle name. * - * @parameter property="config.i18nBundleName" * @since 2.4.8 */ + @Parameter(property = "config.i18nBundleName") private String i18nBundleName; /** * List of application config to include in report (separated by comma). * <p/> - * <strong>Note:</strong> If not filled then will use all config found in class-path. + * <strong>Note:</strong> If not filled then will use all config + * found in class-path. * - * @parameter property="config.include" * @since 2.4.8 */ + @Parameter(property = "config.include") private String include; /** @@ -103,9 +108,9 @@ * <p/> * <strong>Note:</strong> If not filled no config will be exclude. * - * @parameter property="config.exclude" * @since 2.4.8 */ + @Parameter(property = "config.exclude") private String exclude; /** @@ -114,52 +119,50 @@ * <b>Note:</b> Verbose mode is always on if you starts a debug maven instance * (says via {@code -X}). * - * @parameter property="config.verbose" default-value="${maven.verbose}" * @since 2.4.8 */ + @Parameter(property = "config.verbose", defaultValue = "${maven.verbose}") private boolean verbose; /** * Flag to render option in detail (add a section for each option). * - * @parameter property="config.showOptionDetail" default-value="true" * @since 2.4.8 */ + @Parameter(property = "config.showOptionDetail", defaultValue = "true") private boolean showOptionDetail; /** * Skip to generate the report. * - * @parameter property="config.skip" * @since 2.4.8 */ + @Parameter(property = "config.skip") private boolean skip; /** * The Maven Project. * - * @parameter property="project" - * @required - * @readonly * @since 2.4.8 */ + @Component private MavenProject project; /** - * Doxia Site Renderer. + * Doxia Site Renderer component. * - * @component * @since 2.4.8 */ + @Component private Renderer siteRenderer; /** - * Internationalization. + * Internationalization component. * - * @component * @since 2.4.8 */ + @Component private I18N i18n; /** Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AggregateApplicationConfigReport.java =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AggregateApplicationConfigReport.java 2012-08-30 14:43:50 UTC (rev 2408) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AggregateApplicationConfigReport.java 2012-09-02 16:36:14 UTC (rev 2409) @@ -24,6 +24,11 @@ package org.nuiton.util.plugin.report; import org.apache.maven.artifact.DependencyResolutionRequiredException; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.MavenReportException; import org.nuiton.util.ApplicationConfigProvider; @@ -39,23 +44,21 @@ * For each configuration, you can find all his options and actions. * * @author tchemit <chemit(a)codelutin.com> - * @goal aggregate-application-config-report - * @requiresDependencyResolution runtime - * @requiresProject true - * @aggregator * @since 2.4.9 */ +@Mojo(name = "aggregate-application-config-report", aggregator = true, + requiresProject = true, requiresReports = true, + requiresDependencyResolution = ResolutionScope.RUNTIME) +@Execute(phase = LifecyclePhase.COMPILE) public class AggregateApplicationConfigReport extends AbstractApplicationConfigReport { /** * The projects in the reactor. * - * @parameter property="reactorProjects" - * @readonly - * @required - * @since 1.0 + * @since 2.4.9 */ - protected List<?> reactorProjects; + @Parameter(property = "reactorProjects", readonly = true, required = true) + private List<?> reactorProjects; @Override protected ClassLoader createClassLoader() throws MavenReportException { @@ -63,9 +66,8 @@ for (Object o : reactorProjects) { MavenProject p = (MavenProject) o; - List runtimeClasspathElements = null; try { - runtimeClasspathElements = p.getRuntimeClasspathElements(); + List runtimeClasspathElements = p.getRuntimeClasspathElements(); paths.addAll(runtimeClasspathElements); } catch (DependencyResolutionRequiredException e) { throw new MavenReportException("Could not obtain dependencies for project " + p); Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java 2012-08-30 14:43:50 UTC (rev 2408) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java 2012-09-02 16:36:14 UTC (rev 2409) @@ -24,6 +24,9 @@ */ package org.nuiton.util.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.nuiton.util.ApplicationConfigProvider; import java.util.HashSet; @@ -36,21 +39,20 @@ * For each configuration, you can find all his options and actions. * * @author tchemit <chemit(a)codelutin.com> - * @goal application-config-report - * @requiresDependencyResolution runtime - * @requiresProject true * @since 2.4.8 */ +@Mojo(name = "application-config-report", + requiresProject = true, requiresReports = true, + requiresDependencyResolution = ResolutionScope.RUNTIME) public class ApplicationConfigReport extends AbstractApplicationConfigReport { /** - * List of all class path elements. + * List of all class-path elements. * - * @parameter property="project.runtimeClasspathElements" - * @required - * @readonly * @since 2.4.8 */ + @Parameter(property = "project.runtimeClasspathElements", + required = true, readonly = true) private List<String> runtimeClasspathElements; @Override Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-30 14:43:50 UTC (rev 2408) +++ trunk/pom.xml 2012-09-02 16:36:14 UTC (rev 2409) @@ -221,6 +221,13 @@ </dependency> <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${pluginPluginVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-api</artifactId> <version>2.2.1</version>

1 0