Author: tchemit Date: 2009-11-01 17:24:11 +0100 (Sun, 01 Nov 2009) New Revision: 684 Modified: trunk/ trunk/changelog.txt trunk/pom.xml Log: * [FEATURE #109] Ne pas g?\195?\169n?\195?\169rer le report index * add warning and deprecation in compiler * remove maven-dependency-plugin goal invocation in pluginManagments Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - .classpath .project target THIRD-PARTY.txt catalog.xml + .classpath .project target THIRD-PARTY.txt catalog.xml *.iml *.ipr *.iws Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-10-26 19:14:10 UTC (rev 683) +++ trunk/changelog.txt 2009-11-01 16:24:11 UTC (rev 684) @@ -1,3 +1,12 @@ +1.1.0 chemit 20091101 + + * [FEATURE #87] utilisation maven-license-plugin 2.0 et maven-helper-plugin 1.1.0 + * [FEATURE #92] permettre de ne pas utiliser jredmine (property jredmine.safe) + * [FEATURE #104] ajout de profiles pour mettre à jour les en-têtes de licenses + * [FEATURE #109] Ne pas générer le report index + +-- chemit -- Sun, 01 Nov 2009 16:38:13 +0100 + 1.0.2 chemit 20090902 * [FEATURE] #37 finish documentation in french and english language Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-26 19:14:10 UTC (rev 683) +++ trunk/pom.xml 2009-11-01 16:24:11 UTC (rev 684) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> @@ -11,7 +12,7 @@ <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> <version>1.1.0-SNAPSHOT</version> - + <!-- POM Relationships : Inheritance --> <!-- add this in your pom @@ -178,7 +179,7 @@ <properties> <!-- the redmine plateform used (nuiton.org or chorem.org) --> <platform>nuiton.org</platform> - + <!-- a proprerty to define the id of the project, in a multi-module project, you must use a hard-cored value, otherwise for modules the artifactId will be expanded , otherwise, no need to override it @@ -244,10 +245,10 @@ <license.version>2.0.0</license.version> <jrst.version>1.0.0</jrst.version> <skin.version>1.0.0</skin.version> - + <!-- default license to use --> <license.licenseName>lgpl_v3</license.licenseName> - + <!-- release repository url (to be used in site.xml) --> <repository.home.url>http://maven.${platform}/release</repository.home.url> @@ -259,13 +260,13 @@ <redmine.issueLinkTemplate>${redmine.url}/issues/show/%ISSUE%</redmine.issueLinkTemplate> <redmine.versionLinkTemplate>${redmine.url}/versions/show/%VERSION%</redmine.versionLinkTemplate> <redmine.collectedFiles>target/collect.properties</redmine.collectedFiles> - + <!-- extra files to include in release --> - <redmine.releaseFiles /> + <redmine.releaseFiles/> <!-- use this for a lib extra files --> <redmine.libReleaseFiles>target/${project.artifactId}-${project.version}-deps.zip, - target/${project.artifactId}-${project.version}-full.zip + target/${project.artifactId}-${project.version}-full.zip </redmine.libReleaseFiles> </properties> @@ -273,7 +274,7 @@ <packaging>pom</packaging> <build> - + <defaultGoal>install</defaultGoal> <!--Ressources--> <resources> @@ -319,9 +320,9 @@ </execution> </executions> </plugin> - + </plugins> - + <pluginManagement> <plugins> @@ -341,6 +342,8 @@ <source>${maven.compile.source}</source> <target>${maven.compile.target}</target> <encoding>${project.build.sourceEncoding}</encoding> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> </configuration> </plugin> @@ -358,7 +361,7 @@ <plugin> <artifactId>maven-dependency-plugin</artifactId> <version>2.1</version> - <executions> + <!--executions> <execution> <id>copy-dependencies</id> <phase>package</phase> @@ -372,7 +375,7 @@ <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> </execution> - </executions> + </executions--> </plugin> <plugin> @@ -580,6 +583,24 @@ <dependencyDetailsEnabled>${maven.reports.dependencyDetailsEnabled}</dependencyDetailsEnabled> <dependencyLocationsEnabled>${maven.reports.dependencyLocationsEnabled}</dependencyLocationsEnabled> </configuration> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> </plugin> <plugin> @@ -606,7 +627,7 @@ <!-- changelog:changelog changelog:dev-activity changelog:file-activity --> - <!--FIXME : TC-20090816 : there is a bug with fileactivity + <!--FIXME : TC-20090816 : there is a bug with fileactivity in report, trunk url are prefix with tag/xxx-releaseNumber !--> <plugin> <artifactId>maven-changelog-plugin</artifactId> @@ -680,7 +701,7 @@ </reportSet> </reportSets> </plugin--> - + <!-- a voir si on le garde car hudson le fait aussi ? --> <!--plugin> <groupId>org.codehaus.mojo</groupId> @@ -695,7 +716,7 @@ <artifactId>findbugs-maven-plugin</artifactId> <version>1.2</version> </plugin--> - + </plugins> </reporting> @@ -822,7 +843,7 @@ <maven.reports.dependencyLocationsEnabled>false</maven.reports.dependencyLocationsEnabled> </properties> </profile> - + <!-- perform only on a release stage when using the maven-release-plugin --> <profile> <id>release-profile</id> @@ -902,7 +923,8 @@ <artifactId>maven-jredmine-plugin</artifactId> <version>${jredmine.version}</version> <configuration> - <columnNames>key,summary,status,assignee,tracker,priority,version,category,createdOn</columnNames> + <columnNames>key,summary,status,assignee,tracker,priority,version,category,createdOn + </columnNames> </configuration> <reportSets> <reportSet> @@ -1054,7 +1076,8 @@ <runOnce>true</runOnce> <emailTitle>[ANNOUNCEMENT] - ${project.name} ${project.version} released</emailTitle> - <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm</emailContentFile> + <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm + </emailContentFile> <mailSender> <name>${platform} Release Notification</name> <email>noreply@${platform}</email> @@ -1088,7 +1111,7 @@ </execution> </executions> <configuration> - + <!-- for a multi-module just run on root project --> <runOnce>true</runOnce> @@ -1099,7 +1122,8 @@ <filesFromProperties>${redmine.collectedFiles}</filesFromProperties> <!-- publish-news --> - <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm</newsContentFile> + <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm + </newsContentFile> <newsSummary>${project.description}</newsSummary> <newsTitle>${project.name} ${project.version} released</newsTitle> @@ -1269,7 +1293,7 @@ </execution> </executions> </plugin> - + </plugins> </build> <properties> @@ -1288,7 +1312,7 @@ <value>true</value> </property> </activation> - <build> + <build> <defaultGoal>process-resources</defaultGoal> <plugins> <plugin> @@ -1318,7 +1342,7 @@ <value>true</value> </property> </activation> - <build> + <build> <defaultGoal>process-resources</defaultGoal> <plugins> <plugin> @@ -1363,7 +1387,7 @@ <redmine.releaseFiles>src/site/site_fr.xml,src/site/site_en.xml</redmine.releaseFiles> </properties> </profile> - + <!--<profile> <id>reporting</id> <activation> @@ -1461,7 +1485,7 @@ </plugins> </reporting> </profile>--> - + </profiles> - + </project>