Author: tchemit Date: 2013-06-04 15:30:36 +0200 (Tue, 04 Jun 2013) New Revision: 1081 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1081 Log: tidy poms Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-04 13:23:30 UTC (rev 1080) +++ trunk/pom.xml 2013-06-04 13:30:36 UTC (rev 1081) @@ -22,7 +22,6 @@ --> <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> <parent> @@ -34,27 +33,19 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> <version>2.3-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>tutti-persistence</module> - <module>tutti-service</module> - <module>tutti-ui-swing</module> - </modules> - <name>Tutti</name> - <description> Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. </description> - <inceptionYear>2012</inceptionYear> <url>http://forge.codelutin.com/projects/tutti</url> - + <inceptionYear>2012</inceptionYear> <organization> <name>Ifremer</name> <url>http://www.ifremer.fr/</url> </organization> - <licenses> <license> <name>General Public License (GPL)</name> @@ -88,6 +79,12 @@ </developer> </developers> + <modules> + <module>tutti-persistence</module> + <module>tutti-service</module> + <module>tutti-ui-swing</module> + </modules> + <scm> <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> @@ -97,7 +94,6 @@ scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> - <distributionManagement> <site> <id>${platform}</id> @@ -111,8 +107,6 @@ </snapshotRepository> </distributionManagement> - <packaging>pom</packaging> - <properties> <platform>forge.codelutin.com</platform> @@ -169,6 +163,35 @@ </properties> + <repositories> + <repository> + <id>tutti-public-group</id> + <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>tutti-public-group</id> + <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </pluginRepository> + </pluginRepositories> + <dependencyManagement> <dependencies> @@ -415,16 +438,6 @@ </dependencyManagement> <build> - - <extensions> - <!-- Enabling the use of scpexe with maven 3.0 --> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0</version> - </extension> - </extensions> - <pluginManagement> <plugins> @@ -483,40 +496,16 @@ </plugins> </pluginManagement> - + <extensions> + <!-- Enabling the use of scpexe with maven 3.0 --> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0</version> + </extension> + </extensions> </build> - <!-- Repositories needed to find the dependencies --> - <repositories> - <repository> - <id>tutti-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>tutti-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> - <reporting> <excludeDefaults>true</excludeDefaults> </reporting> @@ -561,7 +550,6 @@ </plugins> </build> - </profile> <profile> <id>license-profile</id> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-06-04 13:23:30 UTC (rev 1080) +++ trunk/tutti-persistence/pom.xml 2013-06-04 13:30:36 UTC (rev 1081) @@ -22,7 +22,6 @@ --> <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> <parent> @@ -181,6 +180,21 @@ </dependencies> <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <properties> + <property> + <name>listener</name> + <value>fr.ifremer.tutti.persistence.test.TuttiRunListener</value> + </property> + </properties> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> @@ -226,23 +240,6 @@ </plugin> </plugins> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <properties> - <property> - <name>listener</name> - <value>fr.ifremer.tutti.persistence.test.TuttiRunListener</value> - </property> - </properties> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> - </project> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-06-04 13:23:30 UTC (rev 1080) +++ trunk/tutti-service/pom.xml 2013-06-04 13:30:36 UTC (rev 1081) @@ -22,7 +22,6 @@ --> <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> <parent> @@ -156,7 +155,21 @@ </dependencies> <build> - + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <properties> + <property> + <name>listener</name> + <value>fr.ifremer.tutti.persistence.test.TuttiRunListener</value> + </property> + </properties> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> @@ -186,24 +199,6 @@ </plugin> </plugins> - - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <properties> - <property> - <name>listener</name> - <value>fr.ifremer.tutti.persistence.test.TuttiRunListener</value> - </property> - </properties> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> </project> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-06-04 13:23:30 UTC (rev 1080) +++ trunk/tutti-ui-swing/pom.xml 2013-06-04 13:30:36 UTC (rev 1081) @@ -22,7 +22,6 @@ --> <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> <parent> @@ -89,8 +88,149 @@ </properties> - <build> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-persistence</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-service</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-updater</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <!-- used forApplicationUpdater --> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + + <!-- librairie Jaxx --> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-config</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-validator</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + </dependency> + + <!-- swing widgets --> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-core</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-common</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + </dependency> + + <!-- Logging --> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> <resources> <resource> <directory>src/main/filtered-resources</directory> @@ -115,7 +255,6 @@ </includes> </resource> </resources> - <plugins> <plugin> @@ -232,151 +371,8 @@ </plugin> </plugins> - </build> - <dependencies> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>tutti-persistence</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>tutti-service</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-updater</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - - <!-- used forApplicationUpdater --> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <!-- librairie Jaxx --> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-config</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-validator</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - </dependency> - - <!-- swing widgets --> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-common</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-autocomplete</artifactId> - </dependency> - - <!-- Logging --> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - <profiles>