Author: tchemit Date: 2008-12-30 15:01:17 +0000 (Tue, 30 Dec 2008) New Revision: 271 Modified: lutinpluginproject/trunk/changelog.txt lutinpluginproject/trunk/pom.xml lutinproject/trunk/changelog.txt lutinproject/trunk/pom.xml Log: utilisation du profile release-profile pour mettre les executions n?\195?\169cessaire ?\195?\160 une release (enforcer, javadoc, sources,...) Modified: lutinpluginproject/trunk/changelog.txt =================================================================== --- lutinpluginproject/trunk/changelog.txt 2008-12-15 06:16:43 UTC (rev 270) +++ lutinpluginproject/trunk/changelog.txt 2008-12-30 15:01:17 UTC (rev 271) @@ -1,4 +1,5 @@ 3.3 ?? (200812..) + * 20081230 [chemit] - utilisation du profile release-profile pour mettre les executions nécessaire à une release (enforcer, javadoc, sources,...) * 20081215 [chemit] - ajout des versions de nos plugins ou librairies (a finir...) 3.2 chemit (20081204) Modified: lutinpluginproject/trunk/pom.xml =================================================================== --- lutinpluginproject/trunk/pom.xml 2008-12-15 06:16:43 UTC (rev 270) +++ lutinpluginproject/trunk/pom.xml 2008-12-30 15:01:17 UTC (rev 271) @@ -429,7 +429,7 @@ <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> </configuration> </plugin> - + <!-- - - - - - - - - - - - --> <!-- PHASE PROCESS-SOURCES --> <!-- - - - - - - - - - - - --> @@ -496,6 +496,7 @@ </configuration> <executions> <execution> + <id>attach-licenses</id> <goals> <goal>license</goal> <goal>third-party</goal> @@ -536,9 +537,12 @@ <!-- plugin source --> <plugin> <artifactId>maven-source-plugin</artifactId> + <version>2.0.4</version> + <inherited>true</inherited> <executions> <execution> - <phase>verify</phase> + <id>attach-sources</id> + <!--phase>verify</phase--> <goals> <goal>jar</goal> </goals> @@ -549,13 +553,15 @@ <!-- plugin javadoc --> <plugin> <artifactId>maven-javadoc-plugin</artifactId> + <version>2.5</version> <configuration> <docencoding>${maven.compile.encoding}</docencoding> <encoding>${maven.compile.encoding}</encoding> + <quiet>true</quiet> </configuration> <executions> <execution> - <phase>verify</phase> + <id>attach-javadocs</id> <goals> <goal>jar</goal> </goals> @@ -627,25 +633,25 @@ <plugins> <!-- always check labs properties --> - <plugin> + <!--plugin> <artifactId>maven-enforcer-plugin</artifactId> - </plugin> + </plugin--> <!-- always compute javadoc jar --> - <plugin> + <!--plugin> <artifactId>maven-javadoc-plugin</artifactId> - </plugin> + </plugin--> <!-- always compute source jar --> - <plugin> + <!--plugin> <artifactId>maven-source-plugin</artifactId> - </plugin> + </plugin--> <!-- always add license to classpath --> - <plugin> + <!--plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - </plugin> + </plugin--> <!-- always launch plugin plugin on plugin ! --> <plugin> @@ -715,6 +721,12 @@ <plugin> <artifactId>maven-javadoc-plugin</artifactId> + <version>2.5</version> + <configuration> + <docencoding>${maven.compile.encoding}</docencoding> + <encoding>${maven.compile.encoding}</encoding> + <quiet>true</quiet> + </configuration> </plugin> <!-- changelog:changelog @@ -939,7 +951,57 @@ </plugins> </build> </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> + <build> + <plugins> + <!-- always check labs properties --> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + </plugin> + + <!-- always add license to classpath --> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <executions> + <execution> + <id>attach-licenses</id> + </execution> + </executions> + </plugin> + + <!-- always compute source jar --> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + </execution> + </executions> + </plugin> + + <!-- always compute javadoc jar --> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + <profile> <!-- profile to fix site url only for the pom --> <!-- big hack : test the existance of a rst file to know if we are reaaly in the plugin ? --> <activation> Modified: lutinproject/trunk/changelog.txt =================================================================== --- lutinproject/trunk/changelog.txt 2008-12-15 06:16:43 UTC (rev 270) +++ lutinproject/trunk/changelog.txt 2008-12-30 15:01:17 UTC (rev 271) @@ -1,4 +1,5 @@ 3.3 ?? (200812..) + * 20081230 [chemit] - utilisation du profile release-profile pour mettre les executions nécessaire à une release (enforcer, javadoc, sources,...) * 20081215 [chemit] - ajout des versions de nos plugins ou librairies (a finir...) 3.2 chemit (20081204) Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2008-12-15 06:16:43 UTC (rev 270) +++ lutinproject/trunk/pom.xml 2008-12-30 15:01:17 UTC (rev 271) @@ -234,7 +234,7 @@ <jrst.version>0.8.3</jrst.version> <!-- version of jaxx plugin to use --> - <jaxx.version>0.8-SNAPSHOT</jaxx.version> + <jaxx.version>1.0-SNAPSHOT</jaxx.version> <!-- topia version --> <topia.version>2.1.1</topia.version> @@ -397,7 +397,7 @@ <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> <srcGenDest>${maven.gen.dir}/resources/objectmodel/</srcGenDest> <destDirGen>${maven.gen.dir}/java</destDirGen> - <includes>**/*.objectmodel</includes> + <includes>**/*.objectmodel</includes> <copyVersionDir>src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> </configuration> @@ -427,12 +427,12 @@ <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> <keysModifier>false</keysModifier> <keepBackup>false</keepBackup> - </configuration> + </configuration> </plugin> - <!-- - - - - - - - - --> - <!-- PHASE RESOURCES --> - <!-- - - - - - - - - --> + <!-- - - - - - - - - - - - - --> + <!-- PHASE PROCESS-RESOURCES --> + <!-- - - - - - - - - - - - - --> <!-- plugin resources --> <plugin> @@ -470,6 +470,7 @@ </configuration> <executions> <execution> + <id>attach-licenses</id> <goals> <goal>license</goal> <goal>third-party</goal> @@ -477,7 +478,6 @@ </execution> </executions> </plugin> - <!-- - - - - - --> <!-- PHASE TEST --> <!-- - - - - - --> @@ -559,9 +559,10 @@ <inherited>true</inherited> <executions> <execution> - <phase>verify</phase> + <id>attach-sources</id> <goals> <goal>jar</goal> + <!--goal>test-jar</goal--> </goals> </execution> </executions> @@ -570,18 +571,26 @@ <!-- plugin javadoc --> <plugin> <artifactId>maven-javadoc-plugin</artifactId> + <version>2.5</version> <configuration> <docencoding>${maven.compile.encoding}</docencoding> <encoding>${maven.compile.encoding}</encoding> + <quiet>true</quiet> </configuration> <executions> <execution> - <phase>verify</phase> + <id>attach-javadocs</id> <goals> <goal>jar</goal> + <!--goal>test-jar</goal--> </goals> + <configuration> + <attach>true</attach> + <quiet>true</quiet> + </configuration> </execution> </executions> + </plugin> <!-- - - - - - - - --> @@ -624,6 +633,7 @@ <outputEncoding>${maven.compile.encoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> <locales>${maven.site.locales}</locales> + <attach>false</attach> </configuration> </plugin> @@ -633,20 +643,20 @@ <plugins> <!-- always check labs properties --> - <plugin> + <!--plugin> <artifactId>maven-enforcer-plugin</artifactId> - </plugin> + </plugin--> <!-- always compute source jar --> - <plugin> + <!--plugin> <artifactId>maven-source-plugin</artifactId> - </plugin> + </plugin--> <!-- always add license to classpath --> - <plugin> + <!--plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - </plugin> + </plugin--> <!--Tasks Ant--> <plugin> @@ -710,6 +720,12 @@ <plugin> <artifactId>maven-javadoc-plugin</artifactId> + <version>2.5</version> + <configuration> + <quiet>true</quiet> + <docencoding>${maven.compile.encoding}</docencoding> + <encoding>${maven.compile.encoding}</encoding> + </configuration> </plugin> <!-- changelog:changelog @@ -929,7 +945,58 @@ </plugins> </build> </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> + <build> + <plugins> + + <!-- always check labs properties --> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + </plugin> + + <!-- always add license to classpath --> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <executions> + <execution> + <id>attach-licenses</id> + </execution> + </executions> + </plugin> + + <!-- always compute source jar --> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + </execution> + </executions> + </plugin> + + <!-- always compute javadoc jar --> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + <profile> <!-- profile to fix site url only for the pom --> <!-- big hack : test the existance of a rst file to know if we are reaaly in the plugin ? --> <activation>