Author: tchemit Date: 2014-02-28 18:41:30 +0100 (Fri, 28 Feb 2014) New Revision: 311 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/311 Log: fixes #3106: Updates mavenpom to 5.0 + refs #3104: Introduce JsonConverter Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-28 09:54:52 UTC (rev 310) +++ trunk/pom.xml 2014-02-28 17:41:30 UTC (rev 311) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.7</version> + <version>5.0</version> </parent> <groupId>org.nuiton.web</groupId> @@ -15,7 +15,7 @@ <name>Nuiton Web</name> <description>Common ressources for web applications</description> - <url>http://maven-site.nuiton.org/nuiton-web/</url> + <url>https://doc.nuiton.org/nuiton-web/</url> <inceptionYear>2010</inceptionYear> <developers> @@ -24,7 +24,7 @@ <name>Florian DESBOIS</name> <email>fdesbois@codelutin.com</email> <organization>Code Lutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -34,7 +34,7 @@ <name>Tony Chemit</name> <email>chemit@codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -44,7 +44,7 @@ <name>Jean Couteau</name> <email>couteau@codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -54,7 +54,7 @@ <name>Brendan Le Ny</name> <email>bleny@codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -71,15 +71,15 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:https://svn.nuiton.org/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:https://svn.nuiton.org/nuiton-web/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>https://forge.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement> <site> - <id>${platform}</id> + <id>doc.${platform}</id> <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement> @@ -270,6 +270,13 @@ </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <version>${struts2Version}</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${struts2Version}</version>