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>${project.groupId}</groupId> <artifactId>nuiton-i18n</artifactId> <version>${project.version}</version> <scope>compile</scope> - </dependency> + </dependency--> <dependency> <groupId>org.nuiton.processor</groupId> @@ -78,8 +78,6 @@ <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> - <packaging>jar</packaging> - <properties> <!-- extra files to include in release --> 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>xalan</groupId> <artifactId>xalan</artifactId> - </dependency> + </dependency--> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> </dependency> - <!-- tests dependencies --> - <!--dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <classifier>tests</classifier> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency--> - <!-- provided dependencies --> <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 @@ <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> - <packaging>jar</packaging> - <properties> <!-- extra files to include in release --> 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.apache.velocity</groupId> - <artifactId>velocity</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> + + <!--dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>2.7.1</version> @@ -176,7 +157,7 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> - </dependency> + </dependency--> <!-- tests dependencies --> @@ -187,26 +168,25 @@ <scope>test</scope> </dependency> - <!--dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency--> - <!-- provided dependencies --> <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 @@ <!-- pour un muli module on doit fixer le projectId --> <projectId>i18n</projectId> - <processor.version>1.0.4-SNAPSHOT</processor.version> + <!-- remove this when using mavenpom >= 2.4 --> + <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> + <!-- remove this when using mavenpom >= 2.4 --> + <processorVersion>1.0.4-SNAPSHOT</processorVersion> + <!--Multilanguage maven-site --> <locales>fr,en</locales>