Author: tchemit Date: 2012-11-11 11:36:04 +0100 (Sun, 11 Nov 2012) New Revision: 1993 Url: http://nuiton.org/repositories/revision/i18n/1993 Log: fixes #2420: Updates to commons-lang3 fixes #2421: Updates to xwork-core 2.3.4.1 refs #2418: Updates to helper-m-p 2.0 Modified: trunk/i18n-maven-plugin/pom.xml trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java trunk/pom.xml Modified: trunk/i18n-maven-plugin/pom.xml =================================================================== --- trunk/i18n-maven-plugin/pom.xml 2012-10-30 07:43:41 UTC (rev 1992) +++ trunk/i18n-maven-plugin/pom.xml 2012-11-11 10:36:04 UTC (rev 1993) @@ -51,7 +51,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> + <artifactId>helper-maven-plugin-api</artifactId> </dependency> <dependency> @@ -60,8 +60,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> @@ -213,6 +213,7 @@ <report>issue-tracking</report> <report>license</report> <report>scm</report> + <report>dependency-info</report> <report>dependencies</report> <report>dependency-convergence</report> <report>plugin-management</report> @@ -254,7 +255,7 @@ <tagletArtifact> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-javadoc</artifactId> - <version>1.5.5</version> + <version>${plexusComponentJavadocVersion}</version> </tagletArtifact> </tagletArtifacts> </configuration> Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java 2012-10-30 07:43:41 UTC (rev 1992) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java 2012-11-11 10:36:04 UTC (rev 1993) @@ -25,7 +25,7 @@ package org.nuiton.i18n.plugin.bundle; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Parameter; Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2012-10-30 07:43:41 UTC (rev 1992) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2012-11-11 10:36:04 UTC (rev 1993) @@ -26,7 +26,7 @@ package org.nuiton.i18n.plugin.bundle; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Execute; Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java 2012-10-30 07:43:41 UTC (rev 1992) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java 2012-11-11 10:36:04 UTC (rev 1993) @@ -24,7 +24,7 @@ */ package org.nuiton.i18n.plugin.bundle; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2012-10-30 07:43:41 UTC (rev 1992) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2012-11-11 10:36:04 UTC (rev 1993) @@ -25,7 +25,7 @@ package org.nuiton.i18n.plugin.parser.impl; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.logging.Log; import org.apache.maven.plugins.annotations.Parameter; Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2012-10-30 07:43:41 UTC (rev 1992) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2012-11-11 10:36:04 UTC (rev 1993) @@ -25,7 +25,7 @@ package org.nuiton.i18n.plugin.parser.impl; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java 2012-10-30 07:43:41 UTC (rev 1992) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java 2012-11-11 10:36:04 UTC (rev 1993) @@ -25,7 +25,7 @@ package org.nuiton.i18n.plugin.parser.impl; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.processor.Processor; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 07:43:41 UTC (rev 1992) +++ trunk/pom.xml 2012-11-11 10:36:04 UTC (rev 1993) @@ -55,64 +55,11 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> + <artifactId>helper-maven-plugin-api</artifactId> <version>${helperPluginVersion}</version> <exclusions> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - </exclusion> <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-profile</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-settings</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-api</artifactId> - </exclusion> - - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - </exclusion> - - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - - <exclusion> <groupId>velocity</groupId> <artifactId>velocity</artifactId> </exclusion> @@ -123,7 +70,7 @@ <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> - <version>1.2</version> + <version>2.0</version> </dependency> <!-- provided dependencies --> @@ -158,24 +105,16 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>2.3.4</version> + <version>2.3.4.1</version> </dependency> - <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.5.15</version> + <version>3.0.8</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${antVersion}</version> - <scope>compile</scope> - </dependency> - </dependencies> </dependencyManagement> @@ -198,6 +137,7 @@ <!-- pour un muli module on doit fixer le projectId --> <projectId>i18n</projectId> + <helperPluginVersion>2.0-SNAPSHOT</helperPluginVersion> <processorVersion>1.2.1</processorVersion> <!--Multilanguage maven-site -->