Author: tchemit Date: 2008-10-12 22:33:17 +0000 (Sun, 12 Oct 2008) New Revision: 207 Modified: lutinpluginproject/trunk/changelog lutinpluginproject/trunk/pom.xml lutinproject/trunk/changelog lutinproject/trunk/pom.xml Log: add version properties for our plugin to make easier plugin bump Modified: lutinpluginproject/trunk/changelog =================================================================== --- lutinpluginproject/trunk/changelog 2008-10-10 12:27:23 UTC (rev 206) +++ lutinpluginproject/trunk/changelog 2008-10-12 22:33:17 UTC (rev 207) @@ -1,5 +1,5 @@ ver-3-0 chemit (20080924) - * make site with no copy of any file at all (not in rst, not in ant!) + * add version properties for your plugin to simplify plugin version change * remove maven.verbose property, cause some bad side effects. * add property maven.site.locales to define locales to be used by site * use jrst.verbose in jrst plugin instead of maven.verbose Modified: lutinpluginproject/trunk/pom.xml =================================================================== --- lutinpluginproject/trunk/pom.xml 2008-10-10 12:27:23 UTC (rev 206) +++ lutinpluginproject/trunk/pom.xml 2008-10-12 22:33:17 UTC (rev 207) @@ -201,11 +201,13 @@ </maven.scm.url> <!-- BEWARE, will be suffixed by /${pom.artifactId} by inheritance --> - <maven.scm.developerConnection>scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk + <maven.scm.developerConnection> + scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk </maven.scm.developerConnection> <!-- BEWARE, will be suffixed by /${pom.artifactId} by inheritance --> - <maven.scm.connection>scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk</maven.scm.connection> + <maven.scm.connection>scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk + </maven.scm.connection> <!-- labs host --> <labs.host>labs.libre-entreprise.org</labs.host> @@ -239,6 +241,19 @@ <!-- to allow bad tests --> <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> + + <!-- version of license-switcher plugin to use --> + <license-switcher.version>0.3</license-switcher.version> + + <!-- version of i18n plugin to use --> + <i18n.version>0.6</i18n.version> + + <!-- version of jrst plugin to use --> + <jrst.version>0.8.3</jrst.version> + + <!-- default license to use --> + <license-switcher.licenseName>lgpl_v3</license-switcher.licenseName> + </properties> <packaging>pom</packaging> @@ -319,6 +334,24 @@ <!-- PHASE PROCESS-CLASSES --> <!-- - - - - - - - - - - - --> + <!-- plugin license-switcher --> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- - - - - - --> <!-- PHASE TEST --> <!-- - - - - - --> @@ -386,10 +419,11 @@ <!-- - - - - - - - --> <!-- plugin jrst --> + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.3</version> + <version>${jrst.version}</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> @@ -417,7 +451,7 @@ <artifactId>maven-site-plugin</artifactId> <version>2.0-beta-7</version> <configuration> - <!-- for generated rst files --> + <!-- for generated rst files --> <siteDirectory>${maven.site.gen.dir}</siteDirectory> <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> @@ -456,6 +490,12 @@ <artifactId>maven-source-plugin</artifactId> </plugin> + <!-- always add license to classpath --> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + </plugin> + <!-- always launch plugin plugin on plugin ! --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -547,7 +587,7 @@ <report>changes-report</report> </reports> </reportSet> - </reportSets> + </reportSets> </plugin> <plugin> @@ -716,6 +756,31 @@ <maven.reports.generate>false</maven.reports.generate> </properties> </profile> + <profile> + <id>license</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <goals> + <goal>switch</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> Modified: lutinproject/trunk/changelog =================================================================== --- lutinproject/trunk/changelog 2008-10-10 12:27:23 UTC (rev 206) +++ lutinproject/trunk/changelog 2008-10-12 22:33:17 UTC (rev 207) @@ -1,5 +1,5 @@ ver-3-0 chatellier (20080924) - * make site with no copy of any file at all (not in rst, not in ant!) + * add version properties for your plugin to simplify plugin version change * remove maven.verbose property, cause some bad side effects. * remove plugin maven-plugin-plugin (nothing to be done here...) * add property maven.site.locales to define locales to be used by site Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2008-10-10 12:27:23 UTC (rev 206) +++ lutinproject/trunk/pom.xml 2008-10-12 22:33:17 UTC (rev 207) @@ -179,11 +179,13 @@ </maven.scm.url> <!-- BEWARE, will be suffixed by /${pom.artifactId} by inheritance --> - <maven.scm.developerConnection>scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk + <maven.scm.developerConnection> + scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk </maven.scm.developerConnection> <!-- BEWARE, will be suffixed by /${pom.artifactId} by inheritance --> - <maven.scm.connection>scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk</maven.scm.connection> + <maven.scm.connection>scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk + </maven.scm.connection> <!-- labs host --> <labs.host>labs.libre-entreprise.org</labs.host> @@ -209,14 +211,27 @@ <!-- where to generate source --> <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> - <!-- where to generate site --> + <!-- where to generate site --> <maven.site.gen.dir>${project.build.directory}/generated-site</maven.site.gen.dir> - <!-- locales for the site generation, by default only french --> + <!-- locales for the site generation, by default only french --> <maven.site.locales>fr</maven.site.locales> - + <!-- to allow bad tests --> <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> + + <!-- version of license-switcher to use --> + <license-switcher.version>0.3</license-switcher.version> + + <!-- version of i18n plugin to use --> + <i18n.version>0.6</i18n.version> + + <!-- version of jrst plugin to use --> + <jrst.version>0.8.3</jrst.version> + + <!-- default license to use --> + <license-switcher.licenseName>lgpl_v3</license-switcher.licenseName> + </properties> <packaging>pom</packaging> @@ -283,7 +298,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>0.6</version> + <version>${i18n.version}</version> <configuration> <bundles> <param>fr_FR</param> @@ -333,7 +348,10 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.2</version> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> <executions> <execution> <goals> @@ -460,7 +478,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.3</version> + <version>${jrst.version}</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> @@ -500,7 +518,7 @@ </pluginManagement> <plugins> - + <!-- always compute source jar --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -526,7 +544,7 @@ <mkdir dir="${maven.src.dir}/site"/> <copy todir="${maven.site.gen.dir}" verbose="${maven.verbose}" overwrite="false"> <fileset dir="${maven.src.dir}/site"> - <exclude name="**/rst/**"/> + <exclude name="**/rst/**"/> </fileset> </copy> </tasks> @@ -549,24 +567,24 @@ <!--Site--> <reporting> <plugins> - + <!-- - The Project Info Reports Plugin has twelve goals: - * project-info-reports:cim is used to generate the Project Continuous Integration System report. - * project-info-reports:dependencies is used to generate the Project Dependencies report. - * project-info-reports:dependency-convergence is used to generate the Project Dependency Convergence report for reactor builds. - * project-info-reports:dependency-management is used to generate the Project DependencyManagement report. - * project-info-reports:index is used to generate the Project index page. - * project-info-reports:issue-tracking is used to generate the Project Issue Tracking report. - * project-info-reports:license is used to generate the Project License report. - * project-info-reports:mailing-list is used to generate the Project Mailing List report. - * project-info-reports:plugin-management is used to generate the Project PluginManagement report. - * project-info-reports:project-team is used to generate the Project Team report. - * project-info-reports:scm is used to generate the Project Source Code Management report. - * project-info-reports:summary is used to generate the Project information reports summary. - - Note : la version 2.1 officielle bug sur le caractere ' - --> + The Project Info Reports Plugin has twelve goals: + * project-info-reports:cim is used to generate the Project Continuous Integration System report. + * project-info-reports:dependencies is used to generate the Project Dependencies report. + * project-info-reports:dependency-convergence is used to generate the Project Dependency Convergence report for reactor builds. + * project-info-reports:dependency-management is used to generate the Project DependencyManagement report. + * project-info-reports:index is used to generate the Project index page. + * project-info-reports:issue-tracking is used to generate the Project Issue Tracking report. + * project-info-reports:license is used to generate the Project License report. + * project-info-reports:mailing-list is used to generate the Project Mailing List report. + * project-info-reports:plugin-management is used to generate the Project PluginManagement report. + * project-info-reports:project-team is used to generate the Project Team report. + * project-info-reports:scm is used to generate the Project Source Code Management report. + * project-info-reports:summary is used to generate the Project information reports summary. + + Note : la version 2.1 officielle bug sur le caractere ' + --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> @@ -597,7 +615,7 @@ <report>changes-report</report> </reports> </reportSet> - </reportSets> + </reportSets> </plugin> <plugin> @@ -626,7 +644,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> </plugin> - + <!-- Not official report plugins --> <!-- and not working with viewCVS --> <!--plugin> @@ -769,10 +787,13 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.2</version> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> <executions> <execution> - <goals> + <goals> <goal>switch</goal> </goals> </execution>