Author: tchemit Date: 2014-02-13 15:06:22 +0100 (Thu, 13 Feb 2014) New Revision: 2600 Url: http://nuiton.org/projects/nuiton-maven-report-plugin/repository/revisions/2... Log: fixes #3081: Updates mavenpom to 4.7 fixes #3080: Updates to I18n 3.0 Modified: trunk/LICENSE.txt trunk/pom.xml trunk/src/main/java/org/nuiton/config/ApplicationConfigReportRenderer.java trunk/src/site/site_fr.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2013-08-09 09:03:54 UTC (rev 2599) +++ trunk/LICENSE.txt 2014-02-13 14:06:22 UTC (rev 2600) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-09 09:03:54 UTC (rev 2599) +++ trunk/pom.xml 2014-02-13 14:06:22 UTC (rev 2600) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.7</version> </parent> <artifactId>nuiton-maven-report-plugin</artifactId> @@ -35,13 +35,13 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-maven-report-plugin/trunk + scm:svn:https://nuiton.org/svn/nuiton-maven-report-plugin/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-maven-report-plugin/trunk + scm:svn:https://nuiton.org/svn/nuiton-maven-report-plugin/trunk </developerConnection> <url> - http://nuiton.org/projects/nuiton-maven-report-plugin/repository/show/trunk + https://nuiton.org/projects/nuiton-maven-report-plugin/repository/show/trunk </url> </scm> <distributionManagement> @@ -72,13 +72,13 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-alpha-2</version> </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> - <version>2.5.2</version> + <version>3.0</version> </dependency> <dependency> Modified: trunk/src/main/java/org/nuiton/config/ApplicationConfigReportRenderer.java =================================================================== --- trunk/src/main/java/org/nuiton/config/ApplicationConfigReportRenderer.java 2013-08-09 09:03:54 UTC (rev 2599) +++ trunk/src/main/java/org/nuiton/config/ApplicationConfigReportRenderer.java 2014-02-13 14:06:22 UTC (rev 2600) @@ -41,7 +41,7 @@ import java.util.Locale; import java.util.Set; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Render the {@link ApplicationConfigReport} report. @@ -282,7 +282,7 @@ } else { sinkCellText(option.getKey()); } - sinkCellText(l_(locale, option.getDescription())); + sinkCellText(l(locale, option.getDescription())); if (!optionWithDetail) { sinkCellText(option.getType().getName()); } @@ -321,7 +321,7 @@ for (ConfigActionDef action : actions) { sink.tableRow(); sinkCellText(action.getAction()); - sinkCellText(l_(locale, Arrays.toString(action.getAliases()))); + sinkCellText(l(locale, Arrays.toString(action.getAliases()))); sink.tableRow_(); } @@ -365,7 +365,7 @@ sinkHeaderCellText(headerWidth, getText("report.config.option.description")); sink.tableCell(cellWidth); sink.nonBreakingSpace(); - sink.text(l_(locale, option.getDescription())); + sink.text(l(locale, option.getDescription())); sink.tableCell_(); sink.tableRow_(); Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-08-09 09:03:54 UTC (rev 2599) +++ trunk/src/site/site_fr.xml 2014-02-13 14:06:22 UTC (rev 2600) @@ -30,7 +30,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> @@ -59,7 +59,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.chorem.org/public/images/logos/maven-feather.png"/> + img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/> </poweredBy> @@ -67,15 +67,15 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> </head> <links> - <item name="Nuiton.org" href="http://nuiton.org"/> + <item name="Nuiton.org" href="https://nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com"/> <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> </links> @@ -105,7 +105,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' locale='fr'> + piwikId='${project.piwikId}' locale='fr' + scmwebeditor_vmFiles=',usage.html,' + scmwebeditor_skipDefaultFiles='true'> </div> </footer> </body>