Author: tchemit Date: 2011-05-11 10:07:46 +0200 (Wed, 11 May 2011) New Revision: 69 Url: http://nuiton.org/repositories/revision/nuiton-web/69 Log: fix plugin version updates to struts2 2.2.3 Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java trunk/pom.xml Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-05-10 21:36:26 UTC (rev 68) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-05-11 08:07:46 UTC (rev 69) @@ -2,13 +2,16 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License -# - BSD-style license # - Common Public License Version 1.0 -# - MIT License # - The Apache Software License, Version 2.0 +# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue May 10 16:16:41 CEST 2011 -ognl--ognl--3.0--jar=The Apache Software License, Version 2.0 +#Wed May 11 10:01:56 CEST 2011 +asm--asm--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html +javassist--javassist--3.11.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +ognl--ognl--3.0.1--jar=The Apache Software License, Version 2.0 Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-05-10 21:36:26 UTC (rev 68) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-05-11 08:07:46 UTC (rev 69) @@ -26,7 +26,7 @@ import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.util.ValueStack; -import org.apache.commons.lang.xwork.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -76,7 +76,7 @@ } @Override - public String getText(String aTextName, List<Object> args) { + public String getText(String aTextName, List<?> args) { String value = super.getText(aTextName, args); return getSafeText(aTextName, value); } @@ -88,7 +88,7 @@ } @Override - public String getText(String aTextName, String defaultValue, List<Object> args) { + public String getText(String aTextName, String defaultValue, List<?> args) { String value = super.getText(aTextName, defaultValue, args); return getSafeText(aTextName, value); } @@ -100,7 +100,7 @@ } @Override - public String getText(String key, String defaultValue, List<Object> args, ValueStack stack) { + public String getText(String key, String defaultValue, List<?> args, ValueStack stack) { String value = super.getText(key, defaultValue, args, stack); return getSafeText(key, value); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-10 21:36:26 UTC (rev 68) +++ trunk/pom.xml 2011-05-11 08:07:46 UTC (rev 69) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -42,8 +44,8 @@ <artifactId>jetty-webapp</artifactId> <version>7.1.0.v20100505</version> </dependency> - - <!-- Tapestry --> + + <!-- Tapestry --> <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> @@ -81,7 +83,7 @@ <scope>runtime</scope> </dependency> - <!-- RSS --> + <!-- RSS --> <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> @@ -107,7 +109,7 @@ <version>2.5</version> <scope>provided</scope> </dependency> - + <!-- GWT dependencies (from central repo) --> <dependency> <groupId>com.google.gwt</groupId> @@ -205,6 +207,8 @@ <!-- redmine configuration --> <projectId>nuiton-web</projectId> + <nuitonI18nPluginVersion>2.4-SNAPSHOT</nuitonI18nPluginVersion> + <!-- Tapestry --> <tapestryVersion>5.2.4</tapestryVersion> <slf4jVersion>1.6.1</slf4jVersion> @@ -214,7 +218,7 @@ <gwtPluginVersion>2.1.0-1</gwtPluginVersion> <!-- Strust 2 --> - <struts2Version>2.2.1.1</struts2Version> + <struts2Version>2.2.3</struts2Version> <!--Multilanguage maven-site --> <siteLocales>en,fr</siteLocales> @@ -230,7 +234,7 @@ <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement> - + <build> <pluginManagement> @@ -246,6 +250,19 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nPluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwtPluginVersion}</version> + </plugin> + </plugins> </pluginManagement>