Author: tchemit Date: 2010-05-29 11:48:10 +0000 (Sat, 29 May 2010) New Revision: 3044 Log: - improve build (costy operations are only done in release process : assembly, javadoc, reports) - use pluginManagments - fix multiple plugin declaration (joins them to one with multi execution) - bump javadoc to 2.7.1 - bump mavenpom4labs to 2.1.3 - bump i18n to 1.2.2 - bump eugene to 2.0.1 - bump jrst to 1.1.1 Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-05-18 09:33:49 UTC (rev 3043) +++ isis-fish/trunk/pom.xml 2010-05-29 11:48:10 UTC (rev 3044) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.0.4</version> + <version>2.1.3</version> </parent> <groupId>ifremer</groupId> @@ -448,19 +448,19 @@ <!-- Super pom properties --> <projectId>isis-fish</projectId> <labs.id>8</labs.id> - <javadoc.version>2.6.1</javadoc.version> + <javadoc.version>2.7.1</javadoc.version> <siteLocales>fr,en</siteLocales> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> <license.licenseName>gpl_v2</license.licenseName> <!-- Dependencies version --> <jaxx.version>1.7.1</jaxx.version> - <eugene.version>2.0.0-beta-3</eugene.version> + <eugene.version>2.0.1</eugene.version> <topia.version>2.3.0-beta-6</topia.version> <nuiton-utils.version>1.1.4</nuiton-utils.version> - <nuiton-i18n.version>1.0.1</nuiton-i18n.version> + <nuiton-i18n.version>1.2.2</nuiton-i18n.version> <nuiton-widgets.version>1.0.1</nuiton-widgets.version> - <jrst.version>1.1.0</jrst.version> + <jrst.version>1.1.1</jrst.version> <aspectwerkz.version>2.0</aspectwerkz.version> <xmlrpc.version>3.1.2</xmlrpc.version> @@ -477,6 +477,23 @@ <build> <pluginManagement> <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugene.version}</version> + </plugin> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuiton-i18n.version}</version> + </plugin> <!-- <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> @@ -484,6 +501,7 @@ <showWarnings>true</showWarnings> </configuration> </plugin> --> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> @@ -497,6 +515,7 @@ </archive> </configuration> </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> @@ -519,6 +538,7 @@ </execution> </executions> --> </plugin> + <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> @@ -536,7 +556,6 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> <executions> <execution> <id>eugene-generation</id> @@ -545,7 +564,7 @@ <inputs>zargo</inputs> <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> <defaultPackage>fr.ifremer.isisfish</defaultPackage> - <extractedPackages>fr.ifremer.isisfish</extractedPackages> + <!--<extractedPackages>fr.ifremer.isisfish</extractedPackages>--> <templates> org.nuiton.topia.generator.TopiaMetaTransformer </templates> @@ -554,42 +573,33 @@ <goal>smart-generate</goal> </goals> </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> + <execution> + <id>copyVersionFiles</id> + <phase>generate-sources</phase> + <configuration> + <includes>**/*.objectmodel</includes> + <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> + <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> + <overwrite>true</overwrite> + </configuration> + <goals> + <goal>copyVersionFiles</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> </plugin> - - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> - <executions> - <execution> - <id>copyVersionFiles</id> - <phase>generate-sources</phase> - <configuration> - <includes>**/*.objectmodel</includes> - <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> - <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <overwrite>true</overwrite> - </configuration> - <goals> - <goal>copyVersionFiles</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> <executions> <execution> <goals> @@ -608,7 +618,6 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${nuiton-i18n.version}</version> <configuration> <entries> <entry> @@ -631,8 +640,8 @@ <executions> <execution> <id>copy-dependencies</id> - <phase>package</phase> <configuration> + <silent>true</silent> <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> <goals> @@ -641,28 +650,10 @@ </execution> </executions> </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> - <reporting> + <!--reporting> <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> @@ -677,14 +668,14 @@ </configuration> </plugin> </plugins> - </reporting> + </reporting--> <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> <scm> <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> + <developerConnection>scm:svn:svn+ssh://tchemit at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/trunk/?root=isis-fish</url> </scm> @@ -733,4 +724,88 @@ </site> </distributionManagement> + <profiles> + + <!-- profile to make assembly (included in release process) --> + <profile> + <id>assembly</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + + <defaultGoal>package</defaultGoal> + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + </profile> + + <!-- profile with all reports (included in release process) --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <properties> + + <!-- pmd config --> + <minimumTokens>100</minimumTokens> + <targetJdk>1.6</targetJdk> + </properties> + + <build> + <defaultGoal>site</defaultGoal> + </build> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + <link>http://maven-site.nuiton.org/nuiton-utils/apidocs/</link> + <link>http://maven-site.nuiton.org/nuiton-matrix/apidocs/</link> + <link>http://maven-site.nuiton.org/nuiton-j2r/apidocs/</link> + <link> + http://maven-site.nuiton.org/topia/topia-persistence/apidocs/ + </link> + </links> + </configuration> + </plugin> + + </plugins> + </reporting> + + </profile> + </profiles> + </project>