Author: echatellier Date: 2013-10-28 17:58:02 +0100 (Mon, 28 Oct 2013) New Revision: 3823 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3823 Log: Update libs Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2013-04-08 14:55:26 UTC (rev 3822) +++ branches/4.0.1/pom.xml 2013-10-28 16:58:02 UTC (rev 3823) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.9</version> + <version>4.1</version> </parent> <groupId>fr.ifremer</groupId> @@ -20,21 +20,21 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>2.7.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>3.0-alpha-1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>3.0-alpha-2</version> <scope>compile</scope> </dependency> @@ -90,7 +90,7 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>2.0.6</version> + <version>2.5.0</version> <scope>runtime</scope> </dependency> @@ -189,7 +189,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.3.1</version> + <version>1.3.2</version> </dependency> <dependency> @@ -255,7 +255,7 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.49</version> + <version>0.1.50</version> <scope>compile</scope> </dependency> @@ -288,32 +288,24 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.171</version> + <version>1.3.174</version> <scope>compile</scope> </dependency> - <!-- Migration des bases creee avec h2 1.1 --> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2mig_pagestore_addon</artifactId> - <version>1.3.153</version> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> - <version>1.7.2</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.7.2</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjtools</artifactId> - <version>1.7.2</version> + <version>1.7.3</version> </dependency> <!-- ssj pour les calculs stockastiques --> @@ -329,7 +321,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.7.8</version> + <version>1.8.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <!-- fin svnkit pour communication subversion --> @@ -337,7 +329,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.19</version> + <version>2.3.20</version> <scope>compile</scope> </dependency> @@ -480,14 +472,15 @@ <license.organizationName>Ifremer, Codelutin</license.organizationName> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> + <signatureArtifactId>java16</signatureArtifactId> + <signatureVersion>1.1</signatureVersion> <!-- Dependencies version --> - <jaxxVersion>2.5.16</jaxxVersion> - <eugeneVersion>2.6.2</eugeneVersion> - <topiaVersion>2.8-SNAPSHOT</topiaVersion> - <hibernateVersion>4.2.0.Final</hibernateVersion> - <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <nuitonI18nVersion>2.5</nuitonI18nVersion> + <jaxxVersion>2.5.28</jaxxVersion> + <eugeneVersion>2.6.3</eugeneVersion> + <topiaVersion>2.8.1.3</topiaVersion> + <hibernateVersion>4.2.7.Final</hibernateVersion> + <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles> @@ -686,6 +679,10 @@ <id>nuiton.public</id> <url>http://nexus.nuiton.org/nexus/content/groups/public</url> </repository> + <repository> + <id>svnkit.public</id> + <url>http://maven.tmatesoft.com/content/repositories/snapshots</url> + </repository> </repositories> <pluginRepositories> @@ -757,7 +754,7 @@ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <links> - <link>http://download.oracle.com/javase/6/docs/api/</link> + <link>http://docs.oracle.com/javase/7/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> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-04-08 14:55:26 UTC (rev 3822) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-10-28 16:58:02 UTC (rev 3823) @@ -43,8 +43,8 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.lang3.time.DurationFormatUtils; import org.nuiton.math.matrix.DoubleBigVector; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.config.ConfigOptionDef; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; import org.nuiton.util.StringUtil; import org.nuiton.util.Version; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2013-04-08 14:55:26 UTC (rev 3822) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2013-10-28 16:58:02 UTC (rev 3823) @@ -36,7 +36,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig.Action.Step; +import org.nuiton.config.ApplicationConfig.Action.Step; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.datastore.SimulationPlanStorage; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2013-04-08 14:55:26 UTC (rev 3822) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2013-10-28 16:58:02 UTC (rev 3823) @@ -34,7 +34,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig.Action.Step; +import org.nuiton.config.ApplicationConfig.Action.Step; import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisConfig; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2013-04-08 14:55:26 UTC (rev 3822) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2013-10-28 16:58:02 UTC (rev 3823) @@ -42,7 +42,7 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; import org.hibernate.HibernateException; -import org.hibernate.engine.SessionImplementor; +import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.jdbc.NonContextualLobCreator; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.Type; Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2013-04-08 14:55:26 UTC (rev 3822) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2013-10-28 16:58:02 UTC (rev 3823) @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.nuiton.util.FileUtil; -import org.nuiton.util.config.ArgumentsParserException; +import org.nuiton.config.ArgumentsParserException; import fr.ifremer.isisfish.datastore.AutoMigrationIsisH2Config; import fr.ifremer.isisfish.datastore.CodeSourceStorage.Location;