r984 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
Author: tchemit Date: 2010-11-11 18:52:04 +0100 (Thu, 11 Nov 2010) New Revision: 984 Url: http://nuiton.org/repositories/revision/eugene/984 Log: Evolution #992: Update commons-lang to 2.5 Evolution #1036: Update ant to 1.8.0 Evolution #1037: Update processor to 1.0.4 Evolution #1038: Optimize dependencies Use back librairies previously managed by mavenpom reformat poms Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-11-07 17:20:08 UTC (rev 983) +++ trunk/ant-eugene-task/pom.xml 2010-11-11 17:52:04 UTC (rev 984) @@ -23,109 +23,122 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>2.2.1-SNAPSHOT</version> - </parent> + <modelVersion>4.0.0</modelVersion> - <groupId>org.nuiton.eugene</groupId> - <artifactId>ant-eugene-task</artifactId> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> + <version>2.2.1-SNAPSHOT</version> + </parent> - <!-- POM Relationships : Inheritance : Dependencies --> - <dependencies> + <groupId>org.nuiton.eugene</groupId> + <artifactId>ant-eugene-task</artifactId> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>eugene</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <!-- POM Relationships : Inheritance : Dependencies --> + <dependencies> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>eugene</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <scope>runtime</scope> + </dependency> - </dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>EUGene :: Ant task</name> - <inceptionYear>2006</inceptionYear> - <description>Ant task to use the eugene library</description> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - <packaging>jar</packaging> + </dependencies> - <properties> - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - </properties> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + <name>EUGene :: Ant task</name> + <inceptionYear>2006</inceptionYear> + <description>Ant task to use the eugene library</description> - <profiles> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + <packaging>jar</packaging> - <!-- prepare release assemblies at release time --> - <profile> - <id>release-assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> + <properties> + <!-- extra files to include in release --> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + </properties> - <!-- launch in a release the assembly automaticly --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - <!--<descriptorRef>jar-with-dependencies</descriptorRef>--> - </descriptorRefs> - </configuration> - </plugin> + <profiles> + <!-- prepare release assemblies at release time --> + <profile> + <id>release-assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> - </plugins> - </build> - </profile> - </profiles> + <!-- launch in a release the assembly automaticly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + <!--<descriptorRef>jar-with-dependencies</descriptorRef>--> + </descriptorRefs> + </configuration> + </plugin> + + + </plugins> + </build> + </profile> + </profiles> </project> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-11-07 17:20:08 UTC (rev 983) +++ trunk/eugene/pom.xml 2010-11-11 17:52:04 UTC (rev 984) @@ -23,322 +23,346 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>2.2.1-SNAPSHOT</version> - </parent> - - <groupId>org.nuiton.eugene</groupId> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + <parent> + <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> + <version>2.2.1-SNAPSHOT</version> + </parent> - <!-- POM Relationships : Inheritance : Dependencies --> - <dependencies> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <!-- POM Relationships : Inheritance : Dependencies --> + <dependencies> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <!-- JAXP parser impl for digester --> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <!-- JAXP parser impl for digester --> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </dependency> - <!--dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </dependency--> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <!--exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions--> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <!-- dom4j dep --> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <!--exclusions> - <exclusion> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - </exclusion> - </exclusions--> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <!-- Meta model uml d'eclipse --> - <dependency> - <groupId>org.eclipse.uml2.uml</groupId> - <artifactId>resources</artifactId> - <!--exclusions> - <exclusion> - <groupId>org.eclipse.uml2</groupId> - <artifactId>uml</artifactId> - </exclusion> - </exclusions--> - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> + <!--dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency--> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> + <!--dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency--> - </dependencies> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <scope>runtime</scope> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>EUGene :: EUGene</name> + <!-- dom4j dep --> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <!--exclusions> + <exclusion> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </exclusion> + </exclusions--> + </dependency> - <description>Efficient Universal Generator.</description> - <inceptionYear>2004</inceptionYear> + <!-- Meta model uml d'eclipse --> + <dependency> + <groupId>org.eclipse.uml2.uml</groupId> + <artifactId>resources</artifactId> + <!--exclusions> + <exclusion> + <groupId>org.eclipse.uml2</groupId> + <artifactId>uml</artifactId> + </exclusion> + </exclusions--> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> - <!-- Developers --> - <developers> - <developer> - <name>Benjamin Poussin</name> - <id>bpoussin</id> - <email>poussin@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - <role>Debian packager</role> - </roles> - </developer> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> - <developer> - <name>Arnaud Thimel</name> - <id>athimel</id> - <email>thimel@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> + </dependencies> - <developer> - <name>Julien Ruchaud</name> - <id>jruchaud</id> - <email>ruchaud@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + <name>EUGene :: EUGene</name> - <developer> - <name>Eric Chatellier</name> - <id>echatellier</id> - <email>chatellier@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> + <description>Efficient Universal Generator.</description> + <inceptionYear>2004</inceptionYear> - <developer> - <name>Stéphane Chorlet</name> - <id>schorlet</id> - <email>chorlet@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> + <!-- Developers --> + <developers> + <developer> + <name>Benjamin Poussin</name> + <id>bpoussin</id> + <email>poussin@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + <role>Debian packager</role> + </roles> + </developer> - <developer> - <name>Florian Desbois</name> - <id>fdesbois</id> - <email>fdesbois@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> + <developer> + <name>Arnaud Thimel</name> + <id>athimel</id> + <email>thimel@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - <packaging>jar</packaging> + <developer> + <name>Julien Ruchaud</name> + <id>jruchaud</id> + <email>ruchaud@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> - <properties> - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - </properties> + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> - <build> + <developer> + <name>Stéphane Chorlet</name> + <id>schorlet</id> + <email>chorlet@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> - <resources> - <resource> - <directory>${basedir}/src/main/xsl</directory> - <includes> - <include>**/*.xsl</include> - </includes> - </resource> - <resource> - <directory>src/main/resolver-cache</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> - <plugins> - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <includes>**/*.java</includes> - <!--<includes>org/nuiton/eugene/java/JavaGenerator.java</includes>--> - <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter</filters> - </configuration> - </plugin> + <developer> + <name>Florian Desbois</name> + <id>fdesbois</id> + <email>fdesbois@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> - <!-- expose new plexus components --> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-metadata</artifactId> - <executions> - <execution> - <goals> - <goal>generate-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + <packaging>jar</packaging> - </build> - - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <properties> + <!-- extra files to include in release --> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + </properties> - <profiles> - <!-- prepare release assemblies at release time --> - <profile> - <id>release-assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> + <build> - <!-- launch in a release the assembly automaticly --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> + <resources> + <resource> + <directory>${basedir}/src/main/xsl</directory> + <includes> + <include>**/*.xsl</include> + </includes> + </resource> + <resource> + <directory>src/main/resolver-cache</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.nuiton.processor</groupId> + <artifactId>maven-processor-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> + <includes>**/*.java</includes> + <!--<includes>org/nuiton/eugene/java/JavaGenerator.java</includes>--> + <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter + </filters> + </configuration> + </plugin> - </plugins> - </build> - </profile> + <!-- expose new plexus components --> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + <executions> + <execution> + <goals> + <goal>generate-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> - <!-- perform only on a release stage when using the maven-release-plugin --> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + </build> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> - </plugin> - </plugins> - </reporting> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> - </profile> - </profiles> + <profiles> + <!-- prepare release assemblies at release time --> + <profile> + <id>release-assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <!-- launch in a release the assembly automaticly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + + + </plugins> + </build> + </profile> + + <!-- perform only on a release stage when using the maven-release-plugin --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <version>1.3.8</version> + </plugin> + </plugins> + </reporting> + + </profile> + </profiles> + </project> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-11-07 17:20:08 UTC (rev 983) +++ trunk/maven-eugene-plugin/pom.xml 2010-11-11 17:52:04 UTC (rev 984) @@ -24,198 +24,237 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>2.2.1-SNAPSHOT</version> - </parent> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> + <version>2.2.1-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> - <!-- POM Relationships : Inheritance : Dependencies --> - <dependencies> + <!-- POM Relationships : Inheritance : Dependencies --> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>eugene</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>eugene</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </dependency> - </dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>EUGene :: Maven plugin</name> - <inceptionYear>2006</inceptionYear> - <description>maven plugin to use the eugene library</description> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - <packaging>maven-plugin</packaging> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> - <build> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + </dependency> - <plugins> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> - <!-- expose new plexus components --> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-metadata</artifactId> - <executions> - <execution> - <goals> - <goal>generate-metadata</goal> - </goals> - </execution> - </executions> - </plugin> + </dependencies> - </plugins> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + <name>EUGene :: Maven plugin</name> + <inceptionYear>2006</inceptionYear> + <description>maven plugin to use the eugene library</description> - </build> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + <packaging>maven-plugin</packaging> - <profiles> + <build> - <!-- perform only on a release stage when using the maven-release-plugin --> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <plugins> + <!-- expose new plexus components --> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + <executions> + <execution> + <goals> + <goal>generate-metadata</goal> + </goals> + </execution> + </executions> + </plugin> - <build> + </plugins> - <plugins> + </build> - <!-- plugin plugin --> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <profiles> - </profile> + <!-- perform only on a release stage when using the maven-release-plugin --> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - <!-- perform only on a release stage when using the maven-release-plugin --> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <reporting> - <plugins> - <!--Site report's plugin--> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> - </plugin> + <build> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> - </plugin> - </plugins> - </reporting> + <plugins> - </profile> + <!-- plugin plugin --> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <profile> - <id>run-its</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <configuration> - <pomIncludes> - <pomInclude>evol-879/zargo/pom.xml</pomInclude> - <pomInclude>evol-879/xmi/pom.xml</pomInclude> - <pomInclude>evol-879/model/pom.xml</pomInclude> - <pomInclude>copyVersionFiles/anomalie163/pom.xml</pomInclude> - <pomInclude>smart-generate/only-zargo/pom.xml</pomInclude> - <pomInclude>smart-generate/only-zargo-xmi/pom.xml</pomInclude> - <pomInclude>smart-generate/all/pom.xml</pomInclude> - <pomInclude>smart-generate/generators/pom.xml</pomInclude> - </pomIncludes> - <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> - <settingsFile>src/it/settings.xml</settingsFile> - <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> - <debug>${maven.verbose}</debug> - </configuration> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - <phase>integration-test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + </profile> + <!-- perform only on a release stage when using the maven-release-plugin --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <!--Site report's plugin--> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.5.1</version> + </plugin> + + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <version>1.3.8</version> + </plugin> + </plugins> + </reporting> + + </profile> + + <profile> + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <pomIncludes> + <pomInclude>evol-879/zargo/pom.xml</pomInclude> + <pomInclude>evol-879/xmi/pom.xml</pomInclude> + <pomInclude>evol-879/model/pom.xml</pomInclude> + <pomInclude>copyVersionFiles/anomalie163/pom.xml</pomInclude> + <pomInclude>smart-generate/only-zargo/pom.xml</pomInclude> + <pomInclude>smart-generate/only-zargo-xmi/pom.xml</pomInclude> + <pomInclude>smart-generate/all/pom.xml</pomInclude> + <pomInclude>smart-generate/generators/pom.xml</pomInclude> + </pomIncludes> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${basedir}/target/local-repo + </localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + <debug>${maven.verbose}</debug> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <phase>integration-test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-07 17:20:08 UTC (rev 983) +++ trunk/pom.xml 2010-11-11 17:52:04 UTC (rev 984) @@ -23,7 +23,9 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -68,14 +70,39 @@ <artifactId>xercesImpl</artifactId> <version>2.9.1</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> - <!--dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - </dependency--> + <version>2.5</version> + </dependency> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + </dependency> + + <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>1.8.0</version> @@ -95,6 +122,12 @@ </exclusions> </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> + </dependency> + <!-- dom4j dep --> <dependency> <groupId>jaxen</groupId> @@ -224,21 +257,43 @@ </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <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-settings</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>1.5.15</version> </dependency> - <!--dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.8.2</version> <scope>test</scope> - </dependency--> + </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4jVersion}</version> + <version>1.2.16</version> <scope>test</scope> </dependency> @@ -264,9 +319,10 @@ <!-- pour un muli module on doit fixer le projectId --> <projectId>eugene</projectId> - <ant.version>1.7.1</ant.version> - <processorPluginVersion>1.0.3</processorPluginVersion> + <ant.version>1.8.0</ant.version> + <processorPluginVersion>1.0.4</processorPluginVersion> <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> + <mavenVersion>2.2.1</mavenVersion> <!--Multilanguage maven-site --> <locales>en,fr</locales> @@ -312,7 +368,8 @@ <scm> <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk + </developerConnection> <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm>
participants (1)
-
tchemit＠users.nuiton.org