Author: tchemit Date: 2014-02-04 07:43:05 +0100 (Tue, 04 Feb 2014) New Revision: 2603 Url: http://nuiton.org/projects/nuiton-decorator/repository/revisions/2603 Log: fixes #3037: Updates mavenpom to 4.6 Modified: trunk/LICENSE.txt trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2013-09-30 15:52:30 UTC (rev 2602) +++ trunk/LICENSE.txt 2014-02-04 06:43:05 UTC (rev 2603) @@ -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-09-30 15:52:30 UTC (rev 2602) +++ trunk/pom.xml 2014-02-04 06:43:05 UTC (rev 2603) @@ -5,11 +5,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.6</version> </parent> <artifactId>nuiton-decorator</artifactId> - <version>3.0-alpha-3-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> <name>Nuiton Decorator</name> <description>Simple Decorator API</description> @@ -34,12 +34,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/trunk + scm:svn:https://nuiton.org/svn/nuiton-decorator/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/trunk + scm:svn:https://nuiton.org/svn/nuiton-decorator/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-decorator/repository/show/trunk</url> + <url>https://nuiton.org/projects/nuiton-decorator/repository/show/trunk</url> </scm> <distributionManagement> <site> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-09-30 15:52:30 UTC (rev 2602) +++ trunk/src/site/site_fr.xml 2014-02-04 06:43:05 UTC (rev 2603) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> @@ -58,7 +58,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.chorem.org/public/images/logos/maven-feather.png"/> + img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> </poweredBy> @@ -66,11 +66,11 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> </head> <links> @@ -95,7 +95,7 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' @@ -104,7 +104,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' locale='fr'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> </div> </footer> </body>