Author: mfortun Date: 2011-06-09 18:19:35 +0200 (Thu, 09 Jun 2011) New Revision: 940 Url: http://nuiton.org/repositories/revision/wikitty/940 Log: * update dependency * correct dependency version locations * add missing dependency Modified: trunk/pom.xml trunk/wikitty-publication/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-09 13:02:27 UTC (rev 939) +++ trunk/pom.xml 2011-06-09 16:19:35 UTC (rev 940) @@ -377,7 +377,34 @@ <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> <version>${struts2jqueryVersion}</version> - </dependency> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassistVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${strutsxworksVersion}</version> + </dependency> + </dependencies> @@ -560,10 +587,17 @@ <jettyVersion>7.2.1.v20101111</jettyVersion> <hbaseVersion>0.89.0-SNAPSHOT</hbaseVersion> - <struts2jqueryVersion>3.0.2</struts2jqueryVersion> + <!--Multilanguage maven-site --> <locales>fr,en</locales> + <!--properties used by wikitty publication --> + <struts2jqueryVersion>3.0.2</struts2jqueryVersion> + <struts2Version>2.2.3</struts2Version> + <javassistVersion>3.8.0.GA</javassistVersion> + <strutsxworksVersion>2.2.3</strutsxworksVersion> + + </properties> <!-- ************************************************************* --> @@ -618,5 +652,4 @@ </modules> </profile> </profiles> - </project> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-06-09 13:02:27 UTC (rev 939) +++ trunk/wikitty-publication/pom.xml 2011-06-09 16:19:35 UTC (rev 940) @@ -58,8 +58,6 @@ <scope>provided</scope> </dependency> - - <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> @@ -73,13 +71,11 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> - <version>${struts2Version}</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> <scope>runtime</scope> </dependency> @@ -89,16 +85,28 @@ <scope>runtime</scope> </dependency> + <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </dependency> - <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.8.0.GA</version> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + </dependencies> <!-- ************************************************************* --> @@ -157,7 +165,5 @@ </plugins> </build> - <properties> - <struts2Version>2.2.3</struts2Version> - </properties> + </project>