Author: echatellier Date: 2013-01-23 21:41:15 +0100 (Wed, 23 Jan 2013) New Revision: 1100 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1100 Log: fixes #1727: Update to struts 2.3.8 fixes #1929: Update to HttpComponents 4.2.3 fixes #1930: Update to junit 4.11 fixes #1931: Update to nuiton-utils 2.6.6 fixes #1932: Update to jaxx 2.5.9 Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/pom.xml Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2012-12-29 14:45:19 UTC (rev 1099) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2013-01-23 20:41:15 UTC (rev 1100) @@ -48,6 +48,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.FileManager; +import com.opensymphony.xwork2.FileManagerFactory; import com.opensymphony.xwork2.ValidationAwareSupport; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationManager; @@ -117,8 +118,8 @@ Container container = conf.getContainer(); // huge improve cache performance - FileManager fileManager = container.getInstance(FileManager.class); - fileManager.setReloadingConfigs(false); + FileManagerFactory fileManagerFactory = container.getInstance(FileManagerFactory.class); + fileManagerFactory.setReloadingConfigs("false"); ValueStackFactory stackFactory = container.getInstance(ValueStackFactory.class); ValueStack vs = stackFactory.createValueStack(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-29 14:45:19 UTC (rev 1099) +++ trunk/pom.xml 2013-01-23 20:41:15 UTC (rev 1100) @@ -33,7 +33,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> + <version>4.11</version> <scope>test</scope> </dependency> @@ -96,35 +96,35 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.2.2</version> + <version>4.2.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.2.2</version> + <version>4.2.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.2.2</version> + <version>4.2.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.6.4</version> + <version>2.6.6</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>2.6.4</version> + <version>2.6.6</version> <scope>compile</scope> </dependency> @@ -347,9 +347,9 @@ <license.organizationName>Ifremer, Codelutin</license.organizationName> <!-- Versions --> - <jaxx.version>2.5.6</jaxx.version> + <jaxx.version>2.5.9</jaxx.version> <i18n.version>2.5</i18n.version> - <struts.version>2.3.4.1</struts.version> + <struts.version>2.3.8</struts.version> </properties> <scm> @@ -377,7 +377,7 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>8.1.7.v20120910</version> + <version>8.1.8.v20121106</version> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId>