Author: echatellier Date: 2014-06-16 13:46:42 +0200 (Mon, 16 Jun 2014) New Revision: 4015 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4015 Log: Update libs Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-12 10:49:10 UTC (rev 4014) +++ trunk/pom.xml 2014-06-16 11:46:42 UTC (rev 4015) @@ -20,7 +20,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-2</version> + <version>3.0-rc-3</version> <scope>compile</scope> </dependency> @@ -111,15 +111,14 @@ <artifactId>mail</artifactId> <version>1.4.7</version> <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + </exclusion> + </exclusions> </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - <!-- Jaxx --> <dependency> <groupId>org.nuiton.jaxx</groupId> @@ -198,6 +197,12 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> <version>1.3.2</version> + <exclusions> + <exclusion> + <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -469,7 +474,7 @@ <signatureVersion>1.0</signatureVersion> <!-- Dependencies version --> - <jaxxVersion>2.8.5</jaxxVersion> + <jaxxVersion>2.8.7</jaxxVersion> <eugeneVersion>2.7.4</eugeneVersion> <topiaVersion>2.9-rc-1</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-06-12 10:49:10 UTC (rev 4014) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-06-16 11:46:42 UTC (rev 4015) @@ -120,7 +120,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 3, 0, 1); + protected final static Version version = new Version(4, 3, 0, 2); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version(