Author: sbavencoff Date: 2014-05-28 09:49:15 +0200 (Wed, 28 May 2014) New Revision: 691 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/691 Log: update mavenPom and tidy pom Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-28 07:33:55 UTC (rev 690) +++ trunk/pom.xml 2014-05-28 07:49:15 UTC (rev 691) @@ -1,48 +1,32 @@ <?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"> - <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.6</version> + <version>5.0.7</version> </parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.3-SNAPSHOT</version> - <modules> - <module>sammoa-persistence</module> - <module>sammoa-application</module> - <module>sammoa-ui-swing</module> - </modules> + <packaging>pom</packaging> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>SAMMOA</name> - <description>SAMMOA est un système permettant l’acquisition des données d’observations de faune marine lors de campagnes d’observations aériennes pour l'UMS 3462 Pélagis, anciennement baptisé CRMM et situé à l'université de La Rochelle. </description> - <inceptionYear>2012</inceptionYear> <url>http://forge.codelutin.com/projects/sammoa</url> - + <inceptionYear>2012</inceptionYear> <organization> <name>UMS 3462</name> <url>http://crmm.univ-lr.fr/</url> </organization> - <licenses> <license> <name>General Public License (GPL)</name> @@ -73,20 +57,21 @@ </developer> </developers> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <modules> + <module>sammoa-persistence</module> + <module>sammoa-application</module> + <module>sammoa-ui-swing</module> + </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/sammoa/trunk</url> + <url>http://svn.codelutin.com/sammoa/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.codelutin.com/sammoa/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.codelutin.com/sammoa/trunk </developerConnection> </scm> - <distributionManagement> <site> <id>doc.${platform}</id> @@ -94,11 +79,6 @@ </site> </distributionManagement> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - <packaging>pom</packaging> - <properties> <platform>codelutin.com</platform> @@ -143,11 +123,38 @@ </properties> + <repositories> + <repository> + <id>sammoa-public-group</id> + <url>http://nexus.nuiton.org/nexus/content/groups/sammoa-group/</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>sammoa-public-group</id> + <url>http://nexus.nuiton.org/nexus/content/groups/sammoa-group/</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </pluginRepository> + </pluginRepositories> + <dependencyManagement> <dependencies> - <!-- librairies utils --> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -389,12 +396,6 @@ </exclusions> </dependency> - <!--<dependency>--> - <!--<groupId>org.rxtx</groupId>--> - <!--<artifactId>rxtx</artifactId>--> - <!--<version>2.1.7</version>--> - <!--</dependency>--> - <dependency> <groupId>com.neuronrobotics</groupId> <artifactId>nrjavaserial</artifactId> @@ -406,16 +407,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> @@ -471,40 +462,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>sammoa-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/sammoa-group/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>sammoa-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/sammoa-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> @@ -548,12 +515,12 @@ <plugin> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils-maven-report-plugin</artifactId> - <version>${nuitonUtilsVersion}</version> + <artifactId>nuiton-maven-report-plugin</artifactId> + <version>3.0-rc-1</version> <reportSets> <reportSet> <reports> - <report>aggregate-application-config-report</report> + <report>aggregate-config-report</report> </reports> </reportSet> </reportSets> @@ -569,4 +536,3 @@ </profiles> </project> - Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-05-28 07:33:55 UTC (rev 690) +++ trunk/sammoa-application/pom.xml 2014-05-28 07:49:15 UTC (rev 691) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> @@ -148,7 +148,6 @@ </dependencies> <build> - <plugins> <plugin> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-05-28 07:33:55 UTC (rev 690) +++ trunk/sammoa-persistence/pom.xml 2014-05-28 07:49:15 UTC (rev 691) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> @@ -98,7 +98,6 @@ </dependencies> <build> - <plugins> <plugin> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-05-28 07:33:55 UTC (rev 690) +++ trunk/sammoa-ui-swing/pom.xml 2014-05-28 07:49:15 UTC (rev 691) @@ -5,15 +5,15 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId> - <inceptionYear>2012</inceptionYear> - <url>http://forge.codelutin.com/projects/sammoa</url> <name>SAMMOA :: UI Swing</name> <description>Swing interface using Jaxx</description> + <url>http://forge.codelutin.com/projects/sammoa</url> + <inceptionYear>2012</inceptionYear> <properties> @@ -23,17 +23,14 @@ <jaxx.defaultErrorUIFQN> jaxx.runtime.validator.swing.ui.ImageValidationUI </jaxx.defaultErrorUIFQN> - <!--<jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>--> <jaxx.generateHelp>true</jaxx.generateHelp> <jaxx.generateSearch>false</jaxx.generateSearch> <jaxx.autoImportCss>true</jaxx.autoImportCss> <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> - <!--<jaxx.helpBrokerFQN>fr.ird.observe.ui.ObserveHelpBroker</jaxx.helpBrokerFQN>--> <!-- jaxx help configuration --> <jaxx.helpsetName>sammoa</jaxx.helpsetName> <jaxx.locales>fr,en</jaxx.locales> - <!--<jaxx.helpTarget>src/main/help</jaxx.helpTarget>--> <i18n.bundleOutputName>sammoa-ui-swing</i18n.bundleOutputName> @@ -49,8 +46,6 @@ <dependencies> - <!-- sibling dependencies --> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>sammoa-persistence</artifactId> @@ -250,7 +245,6 @@ </dependencies> <build> - <resources> <resource> <directory>src/main/filtered-resources</directory> @@ -266,7 +260,6 @@ </includes> </resource> </resources> - <plugins> <plugin> @@ -372,7 +365,6 @@ </plugin> </plugins> - </build> <profiles>