Author: tchemit Date: 2012-08-29 22:38:07 +0200 (Wed, 29 Aug 2012) New Revision: 572 Url: http://forge.codelutin.com/repositories/revision/echobase/572 Log: use i18n 2.5 + remove selenium deps Modified: trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-08-29 20:37:14 UTC (rev 571) +++ trunk/echobase-ui/pom.xml 2012-08-29 20:38:07 UTC (rev 572) @@ -187,30 +187,6 @@ <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-java</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-api</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-support</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-chrome-driver</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-firefox-driver</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-htmlunit-driver</artifactId> - </dependency> </dependencies> @@ -271,10 +247,20 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> + <id>parseJsp</id> <goals> + <goal>parserStruts2</goal> + </goals> + <configuration> + <acceptKeyFormat>^echobase\..*$</acceptKeyFormat> + </configuration> + </execution> + <execution> + <id>parseOthersAndGenBundle</id> + <goals> <goal>parserValidation</goal> <goal>parserJava</goal> <goal>gen</goal> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-29 20:37:14 UTC (rev 571) +++ trunk/pom.xml 2012-08-29 20:38:07 UTC (rev 572) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.6</version> + <version>3.3.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -137,14 +137,13 @@ <!-- libraries version --> <eugenePluginVersion>2.5</eugenePluginVersion> - <topiaVersion>2.6.12</topiaVersion> + <topiaVersion>2.6.13</topiaVersion> <nuitonUtilsVersion>2.6</nuitonUtilsVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <nuitonI18nVersion>2.5-SNAPSHOT</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> <struts2Version>2.3.4</struts2Version> <jqueryPluginVersion>3.3.1</jqueryPluginVersion> - <seleniumVersion>2.21.0</seleniumVersion> <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <slf4jVersion>1.6.6</slf4jVersion> @@ -353,43 +352,6 @@ <version>${slf4jVersion}</version> </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-api</artifactId> - <version>${seleniumVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-support</artifactId> - <version>${seleniumVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-chrome-driver</artifactId> - <version>${seleniumVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-firefox-driver</artifactId> - <version>${seleniumVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-htmlunit-driver</artifactId> - <version>${seleniumVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-java</artifactId> - <version>${seleniumVersion}</version> - <scope>test</scope> - </dependency> - </dependencies> </dependencyManagement> @@ -428,7 +390,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin>