Author: echatellier Date: 2011-10-28 11:26:01 +0200 (Fri, 28 Oct 2011) New Revision: 3496 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3496 Log: Update and format poms. Remove labs links. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-27 16:21:38 UTC (rev 3495) +++ trunk/pom.xml 2011-10-28 09:26:01 UTC (rev 3496) @@ -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,19 +12,19 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.0-beta1-SNAPSHOT</version> + <version>4.0.0.0-beta-1-SNAPSHOT</version> <!-- POM Relationships : Inheritance : Dependencies --> <dependencies> - <!-- Nuiton librairies --> + <!-- Nuiton librairies --> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> @@ -38,7 +39,7 @@ <version>2.2.3.1</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> @@ -73,7 +74,7 @@ <version>2.2-SNAPSHOT</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> @@ -89,10 +90,10 @@ </dependency> <dependency> - <groupId>com.fifesoft</groupId> - <artifactId>rsyntaxtextarea</artifactId> - <version>1.5.0</version> - <scope>runtime</scope> + <groupId>com.fifesoft</groupId> + <artifactId>rsyntaxtextarea</artifactId> + <version>1.5.0</version> + <scope>runtime</scope> </dependency> <dependency> @@ -101,7 +102,7 @@ <version>1.4.1</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> @@ -116,7 +117,7 @@ <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> @@ -151,9 +152,9 @@ </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> <dependency> <groupId>commons-collections</groupId> @@ -216,10 +217,10 @@ <version>1.6.1</version> <scope>compile</scope> <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> </exclusions> </dependency> @@ -238,11 +239,8 @@ <scope>compile</scope> </dependency> - <!-- <dependency> - <groupId>com.fifesoft</groupId> - <artifactId>languagesupport</artifactId> - <version>0.7</version> - </dependency> --> + <!-- <dependency> <groupId>com.fifesoft</groupId> <artifactId>languagesupport</artifactId> + <version>0.7</version> </dependency> --> <dependency> <groupId>com.jcraft</groupId> @@ -265,14 +263,14 @@ <version>1.1.1</version> <scope>runtime</scope> <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - <exclusion> - <artifactId>xmlParserAPIs</artifactId> - <groupId>xerces</groupId> - </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>xmlParserAPIs</artifactId> + <groupId>xerces</groupId> + </exclusion> </exclusions> </dependency> @@ -379,9 +377,9 @@ <scope>compile</scope> </dependency> - <!-- <dependency> + <!--<dependency> <groupId>net.sourceforge.cpdetector</groupId> - <artifactId>cpdetector</artifactId> + <artifactId>cpdetector</artifactId> <version>1.0.7</version> <scope>compile</scope> </dependency> --> @@ -392,7 +390,7 @@ <version>1.6.0.16</version> <scope>compile</scope> </dependency> - + <!-- Tests --> <dependency> <groupId>junit</groupId> @@ -425,10 +423,10 @@ <mailingLists> <mailingList> <name>isis-fish-commits</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-commits</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-commits</unsubscribe> - <post>isis-fish-commits@lists.lists.labs.libre-entreprise.org</post> - <archive>http://lists.labs.libre-entreprise.org/pipermail/isis-fish-commits/</archive> + <subscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits</subscribe> + <unsubscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits</unsubscribe> + <post>isis-fish-commits@list.isis-fish.org</post> + <archive>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits/</archive> </mailingList> <mailingList> <name>isis-fish-devel</name> @@ -439,10 +437,10 @@ </mailingList> <mailingList> <name>isis-fish-user</name> - <subscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user</subscribe> - <unsubscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user</unsubscribe> - <post>isis-fish-user@list.isis-fish.org</post> - <archive>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user/</archive> + <subscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-users</subscribe> + <unsubscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-users</unsubscribe> + <post>isis-fish-users@list.isis-fish.org</post> + <archive>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-users/</archive> </mailingList> </mailingLists> @@ -469,7 +467,7 @@ <timezone>+2</timezone> </developer> <developer> - <id>chatellier</id> + <id>echatellier</id> <name>Eric Chatellier</name> <email>chatellier@codelutin.com</email> <organization>CodeLutin</organization> @@ -516,7 +514,7 @@ <packaging>jar</packaging> <properties> - <!-- Super pom properties --> + <!-- Super pom properties --> <projectId>isis-fish</projectId> <siteLocales>fr,en</siteLocales> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> @@ -533,13 +531,12 @@ <aspectwerkzVersion>2.0</aspectwerkzVersion> <!-- jnlp (disabled until retested) - <keystorepath>${codelutin.keystorepath}</keystorepath> + <keystorepath>${codelutin.keystorepath}</keystorepath> <keystorealias>CodeLutin</keystorealias> - <keystorepass>codelutin</keystorepass> - <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> - + <keystorepass>codelutin</keystorepass> + <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> <jnlpCodebase>${project.url}</jnlpCodebase> - <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> --> + <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase>--> </properties> <build> @@ -590,19 +587,19 @@ <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> </systemPropertyVariables> </configuration> - <!-- <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>**/*IT.java</include> - </includes> - </configuration> - </execution> + <!--<executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <includes> + <include>**/*IT.java</include> + </includes> + </configuration> + </execution> </executions> --> </plugin> @@ -631,22 +628,22 @@ <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> </configuration> <goals> <goal>smart-generate</goal> </goals> </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - <scope>runtime</scope> - </dependency> - </dependencies> + </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + <scope>runtime</scope> + </dependency> + </dependencies> </plugin> <plugin> @@ -692,8 +689,8 @@ <execution> <id>copy-dependencies</id> <configuration> - <silent>true</silent> - <outputDirectory>${project.build.directory}/lib</outputDirectory> + <silent>true</silent> + <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> <goals> <goal>copy-dependencies</goal> @@ -705,14 +702,14 @@ </build> <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> + <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> - + <repositories> <repository> <id>nuiton.public</id> @@ -723,90 +720,82 @@ <pluginRepositories> <pluginRepository> <id>nuiton.plugin.public</id> - <url>http://nexu.nuiton.org/nexus/content/groups/public</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> </pluginRepository> </pluginRepositories> - <profiles> + <profiles> - <!-- profile to make assembly (included in release process) --> - <profile> - <id>assembly</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <!-- profile to make assembly (included in release process) --> + <profile> + <id>assembly</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - <build> + <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> - <defaultGoal>package</defaultGoal> - <plugins> + <!-- profile with all reports (included in release process) --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - <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> + <properties> + <!-- pmd config --> + <minimumTokens>100</minimumTokens> + <targetJdk>1.6</targetJdk> + </properties> - </profile> + <build> + <defaultGoal>site</defaultGoal> + </build> - <!-- 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://download.oracle.com/javase/6/docs/api/</link> - <link>http://maven-site.nuiton.org/nuiton-utils/nuiton-utils/apidocs/</link> - <link>http://maven-site.nuiton.org/nuiton-matrix/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> - + <reporting> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <links> + <link>http://download.oracle.com/javase/6/docs/api/</link> + <link>http://maven-site.nuiton.org/nuiton-utils/nuiton-utils/apidocs/</link> + <link>http://maven-site.nuiton.org/nuiton-matrix/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>