Author: tchemit Date: 2010-04-10 16:52:00 +0200 (Sat, 10 Apr 2010) New Revision: 862 Log: prepare version 2.1 Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-04-09 23:09:40 UTC (rev 861) +++ trunk/mavenpom4labs/pom.xml 2010-04-10 14:52:00 UTC (rev 862) @@ -39,7 +39,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.0.8-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>mavenpom4labs</artifactId> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2010-04-09 23:09:40 UTC (rev 861) +++ trunk/mavenpom4redmine/pom.xml 2010-04-10 14:52:00 UTC (rev 862) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.0.8-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>mavenpom4redmine</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-09 23:09:40 UTC (rev 861) +++ trunk/pom.xml 2010-04-10 14:52:00 UTC (rev 862) @@ -38,7 +38,7 @@ <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.0.8-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> <modules> <module>mavenpom4redmine</module> @@ -353,8 +353,6 @@ <!-- release repository url (to be used in site.xml) --> <repository.home.url>http://maven.nuiton.org/release</repository.home.url> - - <environment-dev>true</environment-dev> </properties> <packaging>pom</packaging> @@ -719,11 +717,6 @@ <artifactId>plexus-component-javadoc</artifactId> <version>${plexus-component-javadoc.version}</version> </tagletArtifact> - <!--tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>${plexus-javadoc.version}</version> - </tagletArtifact--> </tagletArtifacts> </configuration> <reportSets> @@ -740,7 +733,7 @@ changelog:dev-activity changelog:file-activity --> <!--FIXME : TC-20090816 : there is a bug with fileactivity -in report, trunk url are prefix with tag/xxx-releaseNumber !--> + in report, trunk url are prefix with tag/xxx-releaseNumber !--> <plugin> <artifactId>maven-changelog-plugin</artifactId> <version>2.1</version> @@ -779,21 +772,6 @@ <version>2.5</version> </plugin> - <!-- a voir si on le garde car hudson le fait aussi ? --> - <!--plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.3</version> - </plugin--> - - <!-- a tester si c'est viable sur du multi-module --> - <!-- il y a une version 2.1 voir pour la conf car sans conf ca plante --> - <!--plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>1.2</version> - </plugin--> - </plugins> </reporting> @@ -878,6 +856,11 @@ <value>true</value> </property> </activation> + + <properties> + <license.descriptor>src/license/project.xml</license.descriptor> + </properties> + <build> <plugins> @@ -908,22 +891,7 @@ </executions> </plugin> - <!-- add license and third-party files to build --> <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>add-license</goal> - <goal>add-third-party</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution> @@ -935,21 +903,57 @@ <rules> <bannedDependencies> <excludes> - <exclude>org.codehaus.plexus:plexus-component-api - </exclude> + <exclude>org.codehaus.plexus:plexus-component-api</exclude> </excludes> - <message>The new containers are not supported. You - probably added a - dependency that is missing the exclusions. + <message> + The new containers are not supported. You + probably added a dependency that is missing the + exclusions. </message> </bannedDependencies> </rules> <fail>true</fail> </configuration> </execution> + <execution> + <id>ensure-license-project-descriptor</id> + <goals> + <goal>enforce</goal> + </goals> + <!--<phase>initialize</phase>--> + <configuration> + <rules> + <requireFilesExist> + <files> + <file>${license.descriptor}</file> + </files> + </requireFilesExist> + </rules> + <ignoreCache>true</ignoreCache> + <failFast>true</failFast> + <fail>true</fail> + + </configuration> + </execution> </executions> </plugin> + + <!-- add license and third-party files to build --> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>update-project-license</goal> + <goal>add-third-party</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> @@ -1104,7 +1108,7 @@ <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution> - <id>check-license</id> + <id>ensure-license-project-descriptor</id> <goals> <goal>enforce</goal> </goals> @@ -1148,7 +1152,7 @@ <!-- ce profile permet de generer les entetes de licenses pour les fichiers java --> - <profile> + <!--profile> <id>update-java-header</id> <activation> <property> @@ -1174,11 +1178,11 @@ </plugin> </plugins> </build> - </profile> + </profile--> <!-- ce profile permet de generer les entetes de licenses pour les fichiers JAXX --> - <profile> + <!--profile> <id>update-jaxx-header</id> <activation> <property> @@ -1208,11 +1212,11 @@ </plugin> </plugins> </build> - </profile> + </profile--> <!-- ce profile permet de generer les entetes de licenses pour les fichiers css JAXX --> - <profile> + <!--profile> <id>update-jaxx-css-header</id> <activation> <property> @@ -1242,11 +1246,11 @@ </plugin> </plugins> </build> - </profile> + </profile--> <!-- ce profile permet de generer les entetes de licenses pour les fichiers properties --> - <profile> + <!--profile> <id>update-properties-header</id> <activation> <property> @@ -1278,9 +1282,9 @@ </plugin> </plugins> </build> - </profile> + </profile--> - <profile> + <!--profile> <id>update-site-header</id> <activation> <property> @@ -1323,7 +1327,7 @@ </plugin> </plugins> </build> - </profile> + </profile--> <!-- just add to build the webstart --> <profile>