- I18n-commits - mailman.cloud.codelutin.com

r1781 - in trunk: . ant-i18n-task maven-i18n-plugin nuiton-i18n nuiton-i18n-editor
by tchemit＠users.nuiton.org 25 Oct '10

25 Oct '10

Author: tchemit Date: 2010-10-25 09:53:33 +0200 (Mon, 25 Oct 2010) New Revision: 1781 Url: http://nuiton.org/repositories/revision/i18n/1781 Log: Evolution #985: Optimize dependencies Evolution #727: Use maven-helper-plugin 1.3 Modified: trunk/ant-i18n-task/pom.xml trunk/maven-i18n-plugin/pom.xml trunk/nuiton-i18n-editor/pom.xml trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2010-10-17 01:37:59 UTC (rev 1780) +++ trunk/ant-i18n-task/pom.xml 2010-10-25 07:53:33 UTC (rev 1781) @@ -42,12 +42,12 @@ <dependencies> - <dependency> +  <dependency> <groupId>org.nuiton.processor</groupId> @@ -78,8 +78,6 @@   - <packaging>jar</packaging> - <properties>  Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2010-10-17 01:37:59 UTC (rev 1780) +++ trunk/maven-i18n-plugin/pom.xml 2010-10-25 07:53:33 UTC (rev 1781) @@ -58,32 +58,20 @@ </dependency> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + +  <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> </dependency> -  -  -  <dependency> @@ -93,6 +81,11 @@ <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> </dependency> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2010-10-17 01:37:59 UTC (rev 1780) +++ trunk/nuiton-i18n/pom.xml 2010-10-25 07:53:33 UTC (rev 1781) @@ -83,8 +83,6 @@   - <packaging>jar</packaging> - <properties>  Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2010-10-17 01:37:59 UTC (rev 1780) +++ trunk/nuiton-i18n-editor/pom.xml 2010-10-25 07:53:33 UTC (rev 1781) @@ -226,7 +226,7 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> - <version>${license.version}</version> + <version>${licensePluginVersion}</version> <configuration> <licenseMerges> <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> @@ -256,7 +256,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:37:59 UTC (rev 1780) +++ trunk/pom.xml 2010-10-25 07:53:33 UTC (rev 1781) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>i18n</artifactId> @@ -71,13 +71,13 @@ <dependency> <groupId>org.nuiton.processor</groupId> <artifactId>nuiton-processor</artifactId> - <version>${processor.version}</version> + <version>${processorVersion}</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> <exclusions> <exclusion> <groupId>org.apache.maven</groupId> @@ -115,31 +115,16 @@ <exclusion> <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> <artifactId>plexus-mail-sender-api</artifactId> </exclusion> <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</artifactId> - </exclusion> - - <exclusion> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </exclusion> <exclusion> <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-cipher</artifactId> - </exclusion> - - <exclusion> - <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-sec-dispatcher</artifactId> </exclusion> @@ -148,14 +133,9 @@ <artifactId>plexus-container-default</artifactId> </exclusion> -  - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> </exclusion> </exclusions> @@ -166,7 +146,8 @@ <artifactId>maven-dependency-tree</artifactId> <version>1.2</version> </dependency> - <dependency> + +   @@ -187,26 +168,25 @@ <scope>test</scope> </dependency> -  -  <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> @@ -253,8 +233,12 @@  <projectId>i18n</projectId> - <processor.version>1.0.4-SNAPSHOT</processor.version> +  + <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> +  + <processorVersion>1.0.4-SNAPSHOT</processorVersion> +  <locales>fr,en</locales>

1 0

r1780 - trunk
by tchemit＠users.nuiton.org 17 Oct '10

17 Oct '10

Author: tchemit Date: 2010-10-17 03:37:59 +0200 (Sun, 17 Oct 2010) New Revision: 1780 Url: http://nuiton.org/repositories/revision/i18n/1780 Log: Update mavenpom4redmineAndCentral to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-08 23:50:19 UTC (rev 1779) +++ trunk/pom.xml 2010-10-17 01:37:59 UTC (rev 1780) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <artifactId>i18n</artifactId>

1 0

r1779 - trunk
by tchemit＠users.nuiton.org 08 Oct '10

08 Oct '10

Author: tchemit Date: 2010-10-09 01:50:19 +0200 (Sat, 09 Oct 2010) New Revision: 1779 Url: http://nuiton.org/repositories/revision/i18n/1779 Log: Update mavenpom4redmineAndCentral to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 15:50:34 UTC (rev 1778) +++ trunk/pom.xml 2010-10-08 23:50:19 UTC (rev 1779) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <artifactId>i18n</artifactId> @@ -148,10 +148,10 @@ <artifactId>plexus-container-default</artifactId> </exclusion> - <exclusion> +  <exclusion> <groupId>org.codehaus.plexus</groupId> @@ -175,7 +175,7 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.1</version> + <version>3.2.1</version> </dependency>  @@ -221,7 +221,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> + <version>1.2.16</version> </dependency> <dependency>

1 0

r1778 - trunk
by tchemit＠users.nuiton.org 03 Oct '10

03 Oct '10

Author: tchemit Date: 2010-10-03 17:50:34 +0200 (Sun, 03 Oct 2010) New Revision: 1778 Url: http://nuiton.org/repositories/revision/i18n/1778 Log: Update mavenpom4redmineAndCentral to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:10:33 UTC (rev 1777) +++ trunk/pom.xml 2010-10-03 15:50:34 UTC (rev 1778) @@ -32,8 +32,8 @@  <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.2.6</version> + <artifactId>mavenpom4redmineAndCentral</artifactId> + <version>2.3</version> </parent> <artifactId>i18n</artifactId> @@ -258,14 +258,6 @@  <locales>fr,en</locales> -  - -  - <arguments>-DperformRelease -Pcentral-safe</arguments> - -  - <releaseProfiles>central-safe</releaseProfiles> - </properties>

1 0

r1777 - trunk
by tchemit＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 10:10:33 +0200 (Wed, 29 Sep 2010) New Revision: 1777 Url: http://nuiton.org/repositories/revision/i18n/1777 Log: Utilisation de mavenpom4redmine 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 09:29:57 UTC (rev 1776) +++ trunk/pom.xml 2010-09-29 08:10:33 UTC (rev 1777) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <artifactId>i18n</artifactId>

1 0

r1776 - trunk
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 11:29:57 +0200 (Thu, 09 Sep 2010) New Revision: 1776 Url: http://nuiton.org/repositories/revision/i18n/1776 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:19:43 UTC (rev 1775) +++ trunk/pom.xml 2010-09-09 09:29:57 UTC (rev 1776) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <artifactId>i18n</artifactId>

1 0

r1775 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:19:43 +0200 (Sun, 29 Aug 2010) New Revision: 1775 Url: http://nuiton.org/repositories/revision/i18n/1775 Log: Utilisation de mavenpom4redmine 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-11 14:46:13 UTC (rev 1774) +++ trunk/pom.xml 2010-08-29 14:19:43 UTC (rev 1775) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.3</version> + <version>2.2.4</version> </parent> <artifactId>i18n</artifactId>

1 0

r1774 - trunk
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 16:46:13 +0200 (Wed, 11 Aug 2010) New Revision: 1774 Url: http://nuiton.org/repositories/revision/i18n/1774 Log: Utilisation de mavenpom4redmine 2.2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 13:15:43 UTC (rev 1773) +++ trunk/pom.xml 2010-08-11 14:46:13 UTC (rev 1774) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2.1</version> + <version>2.2.3</version> </parent> <artifactId>i18n</artifactId>

1 0

r1773 - trunk
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 15:15:43 +0200 (Thu, 01 Jul 2010) New Revision: 1773 Url: http://nuiton.org/repositories/revision/i18n/1773 Log: Utilisation de mavenpom4labs 2.2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 12:54:51 UTC (rev 1772) +++ trunk/pom.xml 2010-07-01 13:15:43 UTC (rev 1773) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2</version> + <version>2.2.2.1</version> </parent> <artifactId>i18n</artifactId>

1 0

r1772 - trunk
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 14:54:51 +0200 (Thu, 01 Jul 2010) New Revision: 1772 Url: http://nuiton.org/repositories/revision/i18n/1772 Log: use new central-safe configuration from mavenpom 2.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 12:30:33 UTC (rev 1771) +++ trunk/pom.xml 2010-07-01 12:54:51 UTC (rev 1772) @@ -258,6 +258,14 @@  <locales>fr,en</locales> +  + +  + <arguments>-DperformRelease -Pcentral-safe</arguments> + +  + <releaseProfiles>central-safe</releaseProfiles> + </properties>  @@ -271,51 +279,4 @@ <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> </scm> - <profiles> - <profile> - <id>central-safe</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - -  - <release.repository>${nuiton.central.release.repository}</release.repository> - - </properties> - - <build> - <defaultGoal>validate</defaultGoal> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>check-central-safe</id> - <inherited>true</inherited> - <goals> - <goal>check-auto-container</goal> - </goals> - <configuration> - <addMavenCentral>true</addMavenCentral> - <failIfNotSafe>true</failIfNotSafe> - <repositories> - <nuiton-central-releases> - http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases - </nuiton-central-releases> - </repositories> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - </profiles> </project>

1 0