Author: tchemit Date: 2010-04-12 18:10:10 +0200 (Mon, 12 Apr 2010) New Revision: 859 Log: - Evolution #369: Use nuiton-i18n 1.2.1 - Evolution #495: Use maven-license-plugin 2.1 - Evolution #496: Use junit 4.8.1 - Anomalie #497: Nuiton release repository must be included in its Added: trunk/src/license/ trunk/src/license/project.xml Modified: trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml trunk/maven-eugene-plugin/src/it/settings.xml trunk/pom.xml Modified: trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml 2010-04-12 15:16:18 UTC (rev 858) +++ trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml 2010-04-12 16:10:10 UTC (rev 859) @@ -20,12 +20,12 @@ <scope>compile</scope> </dependency> - <dependency> + <!--dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>1.1.5</version> <scope>compile</scope> - </dependency> + </dependency--> </dependencies> Modified: trunk/maven-eugene-plugin/src/it/settings.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/settings.xml 2010-04-12 15:16:18 UTC (rev 858) +++ trunk/maven-eugene-plugin/src/it/settings.xml 2010-04-12 16:10:10 UTC (rev 859) @@ -21,36 +21,50 @@ <settings> - <profiles> - <profile> - <id>it-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>local.central</id> - <url>file:///@localRepository@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>local.central</id> - <url>file:///@localRepository@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + + <!-- depot des releases nuiton --> + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> </settings> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-12 15:16:18 UTC (rev 858) +++ trunk/pom.xml 2010-04-12 16:10:10 UTC (rev 859) @@ -174,25 +174,20 @@ <artifactId>plexus-sec-dispatcher</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> </dependency> - <!-- TODO TC-20090823 remove ant deps --> - <!--dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${ant.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>${ant.version}</version> - <scope>runtime</scope> - </dependency--> - - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>${maven.version}</version> @@ -215,7 +210,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>4.8.1</version> <scope>test</scope> </dependency> Added: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml (rev 0) +++ trunk/src/license/project.xml 2010-04-12 16:10:10 UTC (rev 859) @@ -0,0 +1,45 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProjectDescriptor-1.0.0.xsd"> + <mainLicense>lgpl_v3</mainLicense> + + <headers> + + <header> + <commentStyle>java</commentStyle> + <fileSets> + <fileSet> + <basedir>src/main/java</basedir> + <include>**/*.java</include> + </fileSet> + <fileSet> + <basedir>src/test/java</basedir> + <include>**/*.java</include> + </fileSet> + <fileSet> + <basedir>src/target/generated-sources/modello</basedir> + <include>**/*.java</include> + </fileSet> + </fileSets> + </header> + + <header> + <commentStyle>rst</commentStyle> + <fileSet> + <basedir>src/site</basedir> + <include>**/*.rst</include> + </fileSet> + </header> + + <header> + <commentStyle>xml</commentStyle> + <fileSet> + <basedir>src/site</basedir> + <include>**/*.xml</include> + </fileSet> + </header> + + </headers> + +</project> Property changes on: trunk/src/license/project.xml ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL