Author: tchemit Date: 2014-02-04 07:38:32 +0100 (Tue, 04 Feb 2014) New Revision: 2597 Url: http://nuiton.org/projects/nuiton-config/repository/revisions/2597 Log: fixes #3034: Updates mavenpom to 4.6 fixes #3036: updates commons-collections to 4 refs #3035: updates nuiton-utils to 3.0 Modified: trunk/LICENSE.txt trunk/pom.xml trunk/src/main/java/org/nuiton/config/ApplicationConfig.java trunk/src/site/site_fr.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2013-08-09 09:03:51 UTC (rev 2596) +++ trunk/LICENSE.txt 2014-02-04 06:38:32 UTC (rev 2597) @@ -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:51 UTC (rev 2596) +++ trunk/pom.xml 2014-02-04 06:38:32 UTC (rev 2597) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.6</version> </parent> <artifactId>nuiton-config</artifactId> @@ -46,12 +46,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-config/trunk + scm:svn:https://nuiton.org/svn/nuiton-config/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-config/trunk + scm:svn:https://nuiton.org/svn/nuiton-config/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-config/repository/show/trunk</url> + <url>https://nuiton.org/projects/nuiton-config/repository/show/trunk</url> </scm> <distributionManagement> <site> @@ -79,7 +79,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.6.12</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> @@ -93,8 +93,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> Modified: trunk/src/main/java/org/nuiton/config/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2013-08-09 09:03:51 UTC (rev 2596) +++ trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-02-04 06:38:32 UTC (rev 2597) @@ -25,7 +25,7 @@ */ import org.apache.commons.beanutils.ConstructorUtils; -import org.apache.commons.collections.EnumerationUtils; +import org.apache.commons.collections4.EnumerationUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-08-09 09:03:51 UTC (rev 2596) +++ trunk/src/site/site_fr.xml 2014-02-04 06:38:32 UTC (rev 2597) @@ -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> @@ -93,7 +93,7 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' @@ -102,7 +102,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' locale='fr'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> </div> </footer> </body>